2547 files changed, 6547 insertions, 73233 deletions

diff --git a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/kdbg/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/compat
+++ b/ubuntu/_base/applications/development/kdbg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control
index 2df63bacd..38d36840d 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/control
+++ b/ubuntu/_base/applications/development/kdbg/debian/control
@@ -2,7 +2,7 @@ Source: kdbg-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kdbg.org/
 
diff --git a/ubuntu/_base/applications/development/kdbg/debian/rules b/ubuntu/_base/applications/development/kdbg/debian/rules
index 4bac98821..acfdd3d1b 100755
--- a/ubuntu/_base/applications/development/kdbg/debian/rules
+++ b/ubuntu/_base/applications/development/kdbg/debian/rules
@@ -2,8 +2,7 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/compat
+++ b/ubuntu/_base/applications/development/kdiff3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control
index 78d8e0592..19e389670 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/control
+++ b/ubuntu/_base/applications/development/kdiff3/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Eike Sauer <eike@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kdiff3-trinity
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/rules b/ubuntu/_base/applications/development/kdiff3/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/development/kdiff3/debian/rules
+++ b/ubuntu/_base/applications/development/kdiff3/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/compat
+++ b/ubuntu/_base/applications/development/kpicosim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control
index 4397384d7..27b718cf0 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/control
+++ b/ubuntu/_base/applications/development/kpicosim/debian/control
@@ -2,7 +2,7 @@ Source: kpicosim-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kpicosim-trinity
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/rules b/ubuntu/_base/applications/development/kpicosim/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/development/kpicosim/debian/rules
+++ b/ubuntu/_base/applications/development/kpicosim/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/kscope/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kscope/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/kscope/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/kscope/debian/compat b/ubuntu/_base/applications/development/kscope/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kscope/debian/compat
+++ b/ubuntu/_base/applications/development/kscope/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kscope/debian/control b/ubuntu/_base/applications/development/kscope/debian/control
index 24cae5f83..64bfc3967 100644
--- a/ubuntu/_base/applications/development/kscope/debian/control
+++ b/ubuntu/_base/applications/development/kscope/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bison, flex, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bison, flex, tdebase-trinity-dev
 Standards-Version: 3.8.0
 Homepage: http://kscope.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
diff --git a/ubuntu/_base/applications/development/kscope/debian/rules b/ubuntu/_base/applications/development/kscope/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/development/kscope/debian/rules
+++ b/ubuntu/_base/applications/development/kscope/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/compat
+++ b/ubuntu/_base/applications/development/ktechlab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control
index a45c7e13b..27b96b1a4 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/control
+++ b/ubuntu/_base/applications/development/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2)
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs
index 724e08449..76c3076c9 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/docs
+++ b/ubuntu/_base/applications/development/ktechlab/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/rules b/ubuntu/_base/applications/development/ktechlab/debian/rules
index 4b05dbd51..efae1b07a 100755
--- a/ubuntu/_base/applications/development/ktechlab/debian/rules
+++ b/ubuntu/_base/applications/development/ktechlab/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/compat b/ubuntu/_base/applications/development/kxmleditor/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/compat
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/control b/ubuntu/_base/applications/development/kxmleditor/debian/control
index 1486106b3..01ca7f827 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/control
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.0
 
 Package: kxmleditor-trinity
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/docs b/ubuntu/_base/applications/development/kxmleditor/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/docs
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/patches/series b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/rules b/ubuntu/_base/applications/development/kxmleditor/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/development/kxmleditor/debian/rules
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/piklab/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/piklab/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/piklab/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/piklab/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/piklab/debian/compat
+++ b/ubuntu/_base/applications/development/piklab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control
index af567d8cf..28526ba8f 100644
--- a/ubuntu/_base/applications/development/piklab/debian/control
+++ b/ubuntu/_base/applications/development/piklab/debian/control
@@ -2,8 +2,8 @@ Source: piklab-trinity
 Section: electronics
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, quilt, chrpath,
- libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+               libusb-dev, libreadline-dev | libreadline6-dev | libreadline5-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/development/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install
index 4b76727ec..36f006452 100644
--- a/ubuntu/_base/applications/development/piklab/debian/install
+++ b/ubuntu/_base/applications/development/piklab/debian/install
@@ -1,3 +1 @@
 debian/*.xpm opt/trinity/share/pixmaps/
-#debian/*.desktop usr/share/applications/
-#debian/overrides/piklab usr/share/lintian/overrides/
diff --git a/ubuntu/_base/applications/development/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules
index f21c51790..d8f798f1c 100755
--- a/ubuntu/_base/applications/development/piklab/debian/rules
+++ b/ubuntu/_base/applications/development/piklab/debian/rules
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-# Currently is not possible to build piklab with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+-include /usr/share/cdbs/1/class/tde.mk
 
-binary-install/piklab-trinity::
-	mv debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1x debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1
+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/applications/development/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/compat b/ubuntu/_base/applications/development/tdesvn/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/compat
+++ b/ubuntu/_base/applications/development/tdesvn/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/control b/ubuntu/_base/applications/development/tdesvn/debian/control
index 74e482108..8675d224c 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/control
+++ b/ubuntu/_base/applications/development/tdesvn/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
 Standards-Version: 3.8.4
 
 Package: libsvnqt4-trinity
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/docs b/ubuntu/_base/applications/development/tdesvn/debian/docs
index ca0272abf..0b6e0f321 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/docs
+++ b/ubuntu/_base/applications/development/tdesvn/debian/docs
@@ -1,3 +1,2 @@
 AUTHORS
-README
-TODO
+README.md
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1
deleted file mode 100644
index 7a4db503b..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH TDESVN 1 "Dez 2005" "Trinity Desktop Environment" "A Subversion Client for TDE (standalone application)"
-.SH NAME
-tdesvn
-\- A Subversion client for TDE (standalone application)
-.SH SYNOPSIS
-tdesvn [Qt\-options] [TDE\-options] [options] exec <command> [URL] 
-.SH DESCRIPTION
-A Subversion client for TDE (standalone application)
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B exec
-<command>            Execute subversion command ("exec help" for more information, opens TDE Help Center)
-.TP
-.B URL
-Path to local working copy or a repository.
-.SS Options:
-.TP
-.B  \-r  startrev
-[:endrev]      Execute single subversion command on specific revision(-range)
-.TP
-.B  \-R  
-Ask for revision when executing single command
-.TP
-.B  \-o  <file>
-Save output of subversion command (eg "cat") into file <file>
-.TP
-.B  \-l  <number>
-Limit log output to <number>
-.SS 
-.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 EXAMPLE
-tdesvn file:///path/to/local/working/copy
-.br
-tdesvn http://remote/svn/project/trunk
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdesvn/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdesvn/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Rajko Albrecht <ral@alwins-world.de>
-.br
-
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
deleted file mode 100644
index e19bcaf04..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH TDESVNASKPASS 1 "Aug 2005" "Trinity Desktop Environment" "ssh-askpass for tdesvn"
-.SH NAME
-tdesvnaskpass
-\- ssh-askpass for tdesvn
-.SH SYNOPSIS
-tdesvnaskpass [Qt\-options] [TDE\-options] [prompt] 
-.SH DESCRIPTION
-ssh-askpass for tdesvn. 
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B prompt
-Prompt that is displayed to the user.
-.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
-.BR tdesvn(1)
-.br
-.SH AUTHORS
-.nf
-Rajko Albrecht <ral@alwins-world.de>
-.br
-
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/rules b/ubuntu/_base/applications/development/tdesvn/debian/rules
index e56464216..f7ce81d59 100755
--- a/ubuntu/_base/applications/development/tdesvn/debian/rules
+++ b/ubuntu/_base/applications/development/tdesvn/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
@@ -35,4 +34,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
 binary-install/tdesvn-trinity::
 	# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
 	rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
index 8903355a2..7dc6dca33 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
+++ b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
@@ -11,4 +11,4 @@ debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
 debian/tmp/opt/trinity/share/applications/tde/*.desktop
 debian/tmp/opt/trinity/share/doc/tde/
-
+debian/tmp/opt/trinity/share/man/
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
deleted file mode 100644
index 8cb778203..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdesvn.1
-debian/man/tdesvnaskpass.1
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/watch b/ubuntu/_base/applications/development/tdesvn/debian/watch
deleted file mode 100644
index 80c0f090c..000000000
--- a/ubuntu/_base/applications/development/tdesvn/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://tdesvn.alwins-world.de/trac.fcgi/wiki/DownLoads .*tdesvn-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/development/tdexsldbg/debian/changelog b/ubuntu/_base/applications/development/tdexsldbg/debian/changelog
new file mode 100644
index 000000000..ec1d59988
--- /dev/null
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/changelog
@@ -0,0 +1,5 @@
+kxsldbg-trinity (4:14.1.5-0~a) forky; urgency=low
+
+  * Move from tdewebdev into a standalone package.
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Fri, 17 Oct 2025 01:57:27 +0200
diff --git a/ubuntu/_base/applications/development/tdexsldbg/debian/compat b/ubuntu/_base/applications/development/tdexsldbg/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/development/tdexsldbg/debian/control b/ubuntu/_base/applications/development/tdexsldbg/debian/control
new file mode 100644
index 000000000..5bfe08f37
--- /dev/null
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/control
@@ -0,0 +1,26 @@
+Source: kxsldbg-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev
+Standards-Version: 3.8.4
+Homepage: http://www.trinitydesktop.org/
+
+Package: kxsldbg-trinity
+Architecture: any
+Section: text
+Replaces: kxsldbg-trinity (<< 4:14.0.0~)
+Breaks: kxsldbg-trinity (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}
+Suggests: quanta-trinity, khelpcenter-trinity
+Description: graphical XSLT debugger for TDE [Trinity]
+ KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
+ interface as well as a text-based debugger. KXSLDbg can be run as a
+ standalone application or as an embedded TDE part.
+ .
+ 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.
+ .
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
diff --git a/ubuntu/_base/applications/development/tdexsldbg/debian/copyright b/ubuntu/_base/applications/development/tdexsldbg/debian/copyright
new file mode 100644
index 000000000..6723473d3
--- /dev/null
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/copyright
@@ -0,0 +1,431 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Sat, 25 Nov 2000 15:35:08 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sun, 18 Feb 2001 12:00:03 -0600.
+
+It was downloaded from: https://mirror.ppa.trinitydesktop.org/trinity
+
+Upstream Author:
+  Keith Isdale <k_isdale@tpg.com.au>
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions:
+
+    DocBook documentation: (see below)
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+  --------------------
+
+  DocBook Documentation:
+
+    Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Documentation License,
+    Version 1.1 or any later version published by the Free Software
+    Foundation; with no Invariant Sections, with no Front-Cover Texts,
+    and with no Back-Cover Texts.
+
+    A copy of the GNU Free Documentation License (Version 1.2) is
+    included below.
+
+
+                    GNU Free Documentation License
+                      Version 1.2, November 2002
+
+
+     Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+       51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+
+    0. PREAMBLE
+
+    The purpose of this License is to make a manual, textbook, or other
+    functional and useful document "free" in the sense of freedom: to
+    assure everyone the effective freedom to copy and redistribute it,
+    with or without modifying it, either commercially or noncommercially.
+    Secondarily, this License preserves for the author and publisher a way
+    to get credit for their work, while not being considered responsible
+    for modifications made by others.
+
+    This License is a kind of "copyleft", which means that derivative
+    works of the document must themselves be free in the same sense.  It
+    complements the GNU General Public License, which is a copyleft
+    license designed for free software.
+
+    We have designed this License in order to use it for manuals for free
+    software, because free software needs free documentation: a free
+    program should come with manuals providing the same freedoms that the
+    software does.  But this License is not limited to software manuals;
+    it can be used for any textual work, regardless of subject matter or
+    whether it is published as a printed book.  We recommend this License
+    principally for works whose purpose is instruction or reference.
+
+
+    1. APPLICABILITY AND DEFINITIONS
+
+    This License applies to any manual or other work, in any medium, that
+    contains a notice placed by the copyright holder saying it can be
+    distributed under the terms of this License.  Such a notice grants a
+    world-wide, royalty-free license, unlimited in duration, to use that
+    work under the conditions stated herein.  The "Document", below,
+    refers to any such manual or work.  Any member of the public is a
+    licensee, and is addressed as "you".  You accept the license if you
+    copy, modify or distribute the work in a way requiring permission
+    under copyright law.
+
+    A "Modified Version" of the Document means any work containing the
+    Document or a portion of it, either copied verbatim, or with
+    modifications and/or translated into another language.
+
+    A "Secondary Section" is a named appendix or a front-matter section of
+    the Document that deals exclusively with the relationship of the
+    publishers or authors of the Document to the Document's overall subject
+    (or to related matters) and contains nothing that could fall directly
+    within that overall subject.  (Thus, if the Document is in part a
+    textbook of mathematics, a Secondary Section may not explain any
+    mathematics.)  The relationship could be a matter of historical
+    connection with the subject or with related matters, or of legal,
+    commercial, philosophical, ethical or political position regarding
+    them.
+
+    The "Invariant Sections" are certain Secondary Sections whose titles
+    are designated, as being those of Invariant Sections, in the notice
+    that says that the Document is released under this License.  If a
+    section does not fit the above definition of Secondary then it is not
+    allowed to be designated as Invariant.  The Document may contain zero
+    Invariant Sections.  If the Document does not identify any Invariant
+    Sections then there are none.
+
+    The "Cover Texts" are certain short passages of text that are listed,
+    as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+    the Document is released under this License.  A Front-Cover Text may
+    be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+    A "Transparent" copy of the Document means a machine-readable copy,
+    represented in a format whose specification is available to the
+    general public, that is suitable for revising the document
+    straightforwardly with generic text editors or (for images composed of
+    pixels) generic paint programs or (for drawings) some widely available
+    drawing editor, and that is suitable for input to text formatters or
+    for automatic translation to a variety of formats suitable for input
+    to text formatters.  A copy made in an otherwise Transparent file
+    format whose markup, or absence of markup, has been arranged to thwart
+    or discourage subsequent modification by readers is not Transparent.
+    An image format is not Transparent if used for any substantial amount
+    of text.  A copy that is not "Transparent" is called "Opaque".
+
+    Examples of suitable formats for Transparent copies include plain
+    ASCII without markup, Texinfo input format, LaTeX input format, SGML
+    or XML using a publicly available DTD, and standard-conforming simple
+    HTML, PostScript or PDF designed for human modification.  Examples of
+    transparent image formats include PNG, XCF and JPG.  Opaque formats
+    include proprietary formats that can be read and edited only by
+    proprietary word processors, SGML or XML for which the DTD and/or
+    processing tools are not generally available, and the
+    machine-generated HTML, PostScript or PDF produced by some word
+    processors for output purposes only.
+
+    The "Title Page" means, for a printed book, the title page itself,
+    plus such following pages as are needed to hold, legibly, the material
+    this License requires to appear in the title page.  For works in
+    formats which do not have any title page as such, "Title Page" means
+    the text near the most prominent appearance of the work's title,
+    preceding the beginning of the body of the text.
+
+    A section "Entitled XYZ" means a named subunit of the Document whose
+    title either is precisely XYZ or contains XYZ in parentheses following
+    text that translates XYZ in another language.  (Here XYZ stands for a
+    specific section name mentioned below, such as "Acknowledgements",
+    "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+    of such a section when you modify the Document means that it remains a
+    section "Entitled XYZ" according to this definition.
+
+    The Document may include Warranty Disclaimers next to the notice which
+    states that this License applies to the Document.  These Warranty
+    Disclaimers are considered to be included by reference in this
+    License, but only as regards disclaiming warranties: any other
+    implication that these Warranty Disclaimers may have is void and has
+    no effect on the meaning of this License.
+
+
+    2. VERBATIM COPYING
+
+    You may copy and distribute the Document in any medium, either
+    commercially or noncommercially, provided that this License, the
+    copyright notices, and the license notice saying this License applies
+    to the Document are reproduced in all copies, and that you add no other
+    conditions whatsoever to those of this License.  You may not use
+    technical measures to obstruct or control the reading or further
+    copying of the copies you make or distribute.  However, you may accept
+    compensation in exchange for copies.  If you distribute a large enough
+    number of copies you must also follow the conditions in section 3.
+
+    You may also lend copies, under the same conditions stated above, and
+    you may publicly display copies.
+
+
+    3. COPYING IN QUANTITY
+
+    If you publish printed copies (or copies in media that commonly have
+    printed covers) of the Document, numbering more than 100, and the
+    Document's license notice requires Cover Texts, you must enclose the
+    copies in covers that carry, clearly and legibly, all these Cover
+    Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+    the back cover.  Both covers must also clearly and legibly identify
+    you as the publisher of these copies.  The front cover must present
+    the full title with all words of the title equally prominent and
+    visible.  You may add other material on the covers in addition.
+    Copying with changes limited to the covers, as long as they preserve
+    the title of the Document and satisfy these conditions, can be treated
+    as verbatim copying in other respects.
+
+    If the required texts for either cover are too voluminous to fit
+    legibly, you should put the first ones listed (as many as fit
+    reasonably) on the actual cover, and continue the rest onto adjacent
+    pages.
+
+    If you publish or distribute Opaque copies of the Document numbering
+    more than 100, you must either include a machine-readable Transparent
+    copy along with each Opaque copy, or state in or with each Opaque copy
+    a computer-network location from which the general network-using
+    public has access to download using public-standard network protocols
+    a complete Transparent copy of the Document, free of added material.
+    If you use the latter option, you must take reasonably prudent steps,
+    when you begin distribution of Opaque copies in quantity, to ensure
+    that this Transparent copy will remain thus accessible at the stated
+    location until at least one year after the last time you distribute an
+    Opaque copy (directly or through your agents or retailers) of that
+    edition to the public.
+
+    It is requested, but not required, that you contact the authors of the
+    Document well before redistributing any large number of copies, to give
+    them a chance to provide you with an updated version of the Document.
+
+
+    4. MODIFICATIONS
+
+    You may copy and distribute a Modified Version of the Document under
+    the conditions of sections 2 and 3 above, provided that you release
+    the Modified Version under precisely this License, with the Modified
+    Version filling the role of the Document, thus licensing distribution
+    and modification of the Modified Version to whoever possesses a copy
+    of it.  In addition, you must do these things in the Modified Version:
+
+    A. Use in the Title Page (and on the covers, if any) a title distinct
+       from that of the Document, and from those of previous versions
+       (which should, if there were any, be listed in the History section
+       of the Document).  You may use the same title as a previous version
+       if the original publisher of that version gives permission.
+    B. List on the Title Page, as authors, one or more persons or entities
+       responsible for authorship of the modifications in the Modified
+       Version, together with at least five of the principal authors of the
+       Document (all of its principal authors, if it has fewer than five),
+       unless they release you from this requirement.
+    C. State on the Title page the name of the publisher of the
+       Modified Version, as the publisher.
+    D. Preserve all the copyright notices of the Document.
+    E. Add an appropriate copyright notice for your modifications
+       adjacent to the other copyright notices.
+    F. Include, immediately after the copyright notices, a license notice
+       giving the public permission to use the Modified Version under the
+       terms of this License, in the form shown in the Addendum below.
+    G. Preserve in that license notice the full lists of Invariant Sections
+       and required Cover Texts given in the Document's license notice.
+    H. Include an unaltered copy of this License.
+    I. Preserve the section Entitled "History", Preserve its Title, and add
+       to it an item stating at least the title, year, new authors, and
+       publisher of the Modified Version as given on the Title Page.  If
+       there is no section Entitled "History" in the Document, create one
+       stating the title, year, authors, and publisher of the Document as
+       given on its Title Page, then add an item describing the Modified
+       Version as stated in the previous sentence.
+    J. Preserve the network location, if any, given in the Document for
+       public access to a Transparent copy of the Document, and likewise
+       the network locations given in the Document for previous versions
+       it was based on.  These may be placed in the "History" section.
+       You may omit a network location for a work that was published at
+       least four years before the Document itself, or if the original
+       publisher of the version it refers to gives permission.
+    K. For any section Entitled "Acknowledgements" or "Dedications",
+       Preserve the Title of the section, and preserve in the section all
+       the substance and tone of each of the contributor acknowledgements
+       and/or dedications given therein.
+    L. Preserve all the Invariant Sections of the Document,
+       unaltered in their text and in their titles.  Section numbers
+       or the equivalent are not considered part of the section titles.
+    M. Delete any section Entitled "Endorsements".  Such a section
+       may not be included in the Modified Version.
+    N. Do not retitle any existing section to be Entitled "Endorsements"
+       or to conflict in title with any Invariant Section.
+    O. Preserve any Warranty Disclaimers.
+
+    If the Modified Version includes new front-matter sections or
+    appendices that qualify as Secondary Sections and contain no material
+    copied from the Document, you may at your option designate some or all
+    of these sections as invariant.  To do this, add their titles to the
+    list of Invariant Sections in the Modified Version's license notice.
+    These titles must be distinct from any other section titles.
+
+    You may add a section Entitled "Endorsements", provided it contains
+    nothing but endorsements of your Modified Version by various
+    parties--for example, statements of peer review or that the text has
+    been approved by an organization as the authoritative definition of a
+    standard.
+
+    You may add a passage of up to five words as a Front-Cover Text, and a
+    passage of up to 25 words as a Back-Cover Text, to the end of the list
+    of Cover Texts in the Modified Version.  Only one passage of
+    Front-Cover Text and one of Back-Cover Text may be added by (or
+    through arrangements made by) any one entity.  If the Document already
+    includes a cover text for the same cover, previously added by you or
+    by arrangement made by the same entity you are acting on behalf of,
+    you may not add another; but you may replace the old one, on explicit
+    permission from the previous publisher that added the old one.
+
+    The author(s) and publisher(s) of the Document do not by this License
+    give permission to use their names for publicity for or to assert or
+    imply endorsement of any Modified Version.
+
+
+    5. COMBINING DOCUMENTS
+
+    You may combine the Document with other documents released under this
+    License, under the terms defined in section 4 above for modified
+    versions, provided that you include in the combination all of the
+    Invariant Sections of all of the original documents, unmodified, and
+    list them all as Invariant Sections of your combined work in its
+    license notice, and that you preserve all their Warranty Disclaimers.
+
+    The combined work need only contain one copy of this License, and
+    multiple identical Invariant Sections may be replaced with a single
+    copy.  If there are multiple Invariant Sections with the same name but
+    different contents, make the title of each such section unique by
+    adding at the end of it, in parentheses, the name of the original
+    author or publisher of that section if known, or else a unique number.
+    Make the same adjustment to the section titles in the list of
+    Invariant Sections in the license notice of the combined work.
+
+    In the combination, you must combine any sections Entitled "History"
+    in the various original documents, forming one section Entitled
+    "History"; likewise combine any sections Entitled "Acknowledgements",
+    and any sections Entitled "Dedications".  You must delete all sections
+    Entitled "Endorsements".
+
+
+    6. COLLECTIONS OF DOCUMENTS
+
+    You may make a collection consisting of the Document and other documents
+    released under this License, and replace the individual copies of this
+    License in the various documents with a single copy that is included in
+    the collection, provided that you follow the rules of this License for
+    verbatim copying of each of the documents in all other respects.
+
+    You may extract a single document from such a collection, and distribute
+    it individually under this License, provided you insert a copy of this
+    License into the extracted document, and follow this License in all
+    other respects regarding verbatim copying of that document.
+
+
+    7. AGGREGATION WITH INDEPENDENT WORKS
+
+    A compilation of the Document or its derivatives with other separate
+    and independent documents or works, in or on a volume of a storage or
+    distribution medium, is called an "aggregate" if the copyright
+    resulting from the compilation is not used to limit the legal rights
+    of the compilation's users beyond what the individual works permit.
+    When the Document is included in an aggregate, this License does not
+    apply to the other works in the aggregate which are not themselves
+    derivative works of the Document.
+
+    If the Cover Text requirement of section 3 is applicable to these
+    copies of the Document, then if the Document is less than one half of
+    the entire aggregate, the Document's Cover Texts may be placed on
+    covers that bracket the Document within the aggregate, or the
+    electronic equivalent of covers if the Document is in electronic form.
+    Otherwise they must appear on printed covers that bracket the whole
+    aggregate.
+
+
+    8. TRANSLATION
+
+    Translation is considered a kind of modification, so you may
+    distribute translations of the Document under the terms of section 4.
+    Replacing Invariant Sections with translations requires special
+    permission from their copyright holders, but you may include
+    translations of some or all Invariant Sections in addition to the
+    original versions of these Invariant Sections.  You may include a
+    translation of this License, and all the license notices in the
+    Document, and any Warranty Disclaimers, provided that you also include
+    the original English version of this License and the original versions
+    of those notices and disclaimers.  In case of a disagreement between
+    the translation and the original version of this License or a notice
+    or disclaimer, the original version will prevail.
+
+    If a section in the Document is Entitled "Acknowledgements",
+    "Dedications", or "History", the requirement (section 4) to Preserve
+    its Title (section 1) will typically require changing the actual
+    title.
+
+
+    9. TERMINATION
+
+    You may not copy, modify, sublicense, or distribute the Document except
+    as expressly provided for under this License.  Any other attempt to
+    copy, modify, sublicense or distribute the Document is void, and will
+    automatically terminate your rights under this License.  However,
+    parties who have received copies, or rights, from you under this
+    License will not have their licenses terminated so long as such
+    parties remain in full compliance.
+
+
+    10. FUTURE REVISIONS OF THIS LICENSE
+
+    The Free Software Foundation may publish new, revised versions
+    of the GNU Free Documentation License from time to time.  Such new
+    versions will be similar in spirit to the present version, but may
+    differ in detail to address new problems or concerns.  See
+    http://www.gnu.org/copyleft/.
+
+    Each version of the License is given a distinguishing version number.
+    If the Document specifies that a particular numbered version of this
+    License "or any later version" applies to it, you have the option of
+    following the terms and conditions either of that specified version or
+    of any later version that has been published (not as a draft) by the
+    Free Software Foundation.  If the Document does not specify a version
+    number of this License, you may choose any version ever published (not
+    as a draft) by the Free Software Foundation.
+
+
+    ADDENDUM: How to use this License for your documents
+
+    To use this License in a document you have written, include a copy of
+    the License in the document and put the following copyright and
+    license notices just after the title page:
+
+        Copyright (c)  YEAR  YOUR NAME.
+        Permission is granted to copy, distribute and/or modify this document
+        under the terms of the GNU Free Documentation License, Version 1.2
+        or any later version published by the Free Software Foundation;
+        with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+        Texts.  A copy of the license is included in the section entitled
+        "GNU Free Documentation License".
+
+    If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+    replace the "with...Texts." line with this:
+
+        with the Invariant Sections being LIST THEIR TITLES, with the
+        Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+    If you have Invariant Sections without Cover Texts, or some other
+    combination of the three, merge those two alternatives to suit the
+    situation.
+
+    If your document contains nontrivial examples of program code, we
+    recommend releasing these examples in parallel under your choice of
+    free software license, such as the GNU General Public License,
+    to permit their use in free software.
diff --git a/ubuntu/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg b/ubuntu/_base/applications/development/tdexsldbg/debian/doc-base.kxsldbg
index 2f14db1f4..2f14db1f4 100644
--- a/ubuntu/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/doc-base.kxsldbg
diff --git a/ubuntu/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg b/ubuntu/_base/applications/development/tdexsldbg/debian/doc-base.xsldbg
index e4147f24f..e4147f24f 100644
--- a/ubuntu/_base/core/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/doc-base.xsldbg
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/development/tdexsldbg/debian/docs
index 0b6e0f321..0b6e0f321 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/docs
diff --git a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.menu b/ubuntu/_base/applications/development/tdexsldbg/debian/menu
index 685853031..685853031 100644
--- a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.menu
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/menu
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/rules b/ubuntu/_base/applications/development/tdexsldbg/debian/rules
index 9bd279c93..acfdd3d1b 100755
--- a/ubuntu/_base/applications/system/kpowersave/debian/rules
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -16,8 +14,4 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_GCC_VISIBILITY="ON"
-
-install/kpowersave-trinity::
-	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
-	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/source/format b/ubuntu/_base/applications/development/tdexsldbg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/format
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/source/format
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options b/ubuntu/_base/applications/development/tdexsldbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options
+++ b/ubuntu/_base/applications/development/tdexsldbg/debian/source/options
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/changelog b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/changelog
new file mode 100644
index 000000000..c665103d8
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/changelog
@@ -0,0 +1,95 @@
+universal-indent-gui-tqt (1.2.0-2) unstable; urgency=medium
+
+  * Port to TQt3 and package renaming
+  * Initial release for TQt3
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Mon, 16 Jul 2022 16:06:00 +0900
+
+universalindentgui (1.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for new qscintilla2 library names (Closes: #885647)
+
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 04 Jan 2018 07:06:09 -0500
+
+universalindentgui (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop 02_fix_gcc_4.5_build.patch - merged upstream.
+  * Update debian/contol:
+    - bump debhelper to 9.
+    - bump Standards-Version to 3.9.3 (no changes needed).
+
+ -- Fathi Boudra <fabo@debian.org>  Tue, 22 May 2012 08:49:27 +0300
+
+universalindentgui (1.1.0-2) unstable; urgency=low
+
+  * Add 02_fix_gcc_4.5_build.patch (Closes: #565043)
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 21 Feb 2011 12:21:21 +0200
+
+universalindentgui (1.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update debian/control:
+    - Bump quilt and debhelper build-dependency versions.
+    - Bump Standards-Version to 3.8.3 (no changes needed).
+  * Convert debian/rules to dh usage.
+  * Rename debian/universalindentgui.lintian to
+    debian/universalindentgui.lintian-overrides for dh_lintian usage.
+  * Add debian/README.source file.
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 20 Aug 2009 13:41:45 +0200
+
+universalindentgui (1.0.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - The default editor font type is now Monospace instead of Courier.
+      (Closes: #483873)
+  * Add 01_disable_check_for_update.diff patch:
+    Automatic check for update is disabled by default. (Closes: #514999)
+  * Bump debian/compat to 7.
+  * Update debian/control:
+    - Set Thomas Schweitzer as maintainer and myself as uploader.
+      (Closes: #483068)
+    - Bump debhelper build-dependency to 7.
+    - Bump Standards-Version to 3.8.1. No changes needed.
+    - Update recommended beautifier list.
+    - Update description to list all supported beautifiers.
+  * Update debian/copyright:
+    - Add PerlTidy.pm and JsDecoder.js missing copyrights.
+  * Cleanup debian/rules.
+
+ -- Fathi Boudra <fabo@debian.org>  Wed, 29 Apr 2009 10:50:58 +0200
+
+universalindentgui (0.8.1-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Avoid symlink attacks by using mkdtemp (Closes: 504726)
+
+ -- Eddy Petrișor <eddy.petrisor@gmail.com>  Wed, 12 Nov 2008 01:34:23 +0200
+
+universalindentgui (0.8.1-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * urgency high since universalindentgui is actually useless by default
+    (can be hacked to work by setting TMPDIR='/tmp/a')
+  * fixed temporary path asamblation so indents can work
+    (Closes: 486577)
+
+ -- Eddy Petrișor <eddy.petrisor@gmail.com>  Wed, 05 Nov 2008 03:51:48 +0200
+
+universalindentgui (0.8.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules: Do not delete perltidy as it's no longer shipped
+  * debian/rules: Cleanup extended
+
+ -- Sebastian Pipping <webmaster@hartwork.org>  Wed, 02 April 2008 04:45:00 +0100
+
+universalindentgui (0.8.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #459671)
+  * Add man page missing in release archive (svn revision 603 plus fixes)
+
+ -- Sebastian Pipping <webmaster@hartwork.org>  Tue, 08 Jan 2008 15:13:53 +0100
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/compat b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/control b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/control
new file mode 100644
index 000000000..6c1592df7
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/control
@@ -0,0 +1,42 @@
+Source: universal-indent-gui-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Thomas Schweitzer <thomas-schweitzer@arcor.de>
+XSBC-Original-Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: tde-cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libtqscintilla-dev
+Standards-Version: 3.9.3
+
+Package: universal-indent-gui-tqt
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: astyle, bcpp, csstidy, hindent, indent, perltidy, tidy, uncrustify, xmlindent
+Description: GUI frontend for several code beautifiers
+ UniversalIndentGui is a GUI fontend for several code beautifiers, currently
+ supporting:
+  * Artistic Styler
+  * BCPP
+  * Cobol Beautify
+  * CSSTidy
+  * Fortran 90 PPR
+  * GNU Indent
+  * GreatCode
+  * hindent
+  * HTB
+  * Javascript Decoder
+  * JSPPP
+  * Perl Tidy
+  * PHP_Beautifier
+  * PHP Code Beautifier
+  * PHP Stylist
+  * pindent
+  * Ruby Beautify
+  * Ruby Formatter
+  * Shell Indent
+  * (HTML) Tidy
+  * Uncrustify
+  * XML Indent
+ .
+ UniversalIndentGui allows you to tune a beautifier's configuration and see
+ how the changes affects a source example live. It is especially useful to
+ compare different C/C++ beautifiers when you have to choose one of them.
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/copyright b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/copyright
new file mode 100644
index 000000000..4ca630432
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/copyright
@@ -0,0 +1,64 @@
+This code was ported to TQt3 and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/universalindentgui/1.2.0-1.1
+
+The original package was debianized by:
+
+    Fathi Boudra <fabo@debian.org> on Wed, 29 Apr 2009 10:50:58 +0200
+
+It was downloaded from:
+
+    http://universalindent.sourceforge.net
+
+Upstream Author:
+
+    Thomas Schweitzer <thomas-schweitzer@arcor.de>
+
+Copyright:
+
+    Copyright (C) 2006-2012 Thomas Schweitzer
+
+Copyright for indenters/PerlTidyLib.pm file:
+
+    Copyright (C) 2000-2007 Steve Hancock
+
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+Copyright for indenters/JsDecoder.js file:
+
+    Copyright (C) 2004-2006 Cezary Tomczak
+
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+UniversalIndentGUI license:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as
+    published by the Free Software Foundation.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'
+and the GPL version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2,
+see `/usr/share/common-licenses/GPL-2'.
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/docs b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/docs
new file mode 100644
index 000000000..233eccf4d
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/docs
@@ -0,0 +1,2 @@
+CHANGELOG.txt
+readme.html
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules
index 5772f17f6..871fe5c7a 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules
@@ -1,14 +1,14 @@
-#! /usr/bin/make -f
+#!/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
-
-version=Debian Package $(DEB_VERSION)
-DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
  -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCONFIG_INSTALL_DIR="/etc/universal-indent-gui-tqt" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/source/format
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/source/options
diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/universal-indent-gui-tqt.menu b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/universal-indent-gui-tqt.menu
new file mode 100644
index 000000000..17418bf4e
--- /dev/null
+++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/universal-indent-gui-tqt.menu
@@ -0,0 +1,5 @@
+?package(universal-indent-gui-tqt): \
+  needs="X11" \
+  section="Applications/Programming" \
+  title="Universal Indent Gui TQt" \
+  command="/usr/bin/universal-indent-gui-tqt"
diff --git a/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/games/knights/debian/cdbs/versions.pl b/ubuntu/_base/applications/games/knights/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/games/knights/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/games/knights/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/games/knights/debian/compat
+++ b/ubuntu/_base/applications/games/knights/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/games/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control
index 6b64a15ad..cf402c8f6 100644
--- a/ubuntu/_base/applications/games/knights/debian/control
+++ b/ubuntu/_base/applications/games/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/games/knights/debian/rules b/ubuntu/_base/applications/games/knights/debian/rules
index 01a4fb689..6f721a63c 100755
--- a/ubuntu/_base/applications/games/knights/debian/rules
+++ b/ubuntu/_base/applications/games/knights/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/changelog b/ubuntu/_base/applications/games/tdeknighttour/debian/changelog
new file mode 100644
index 000000000..42d8e24ff
--- /dev/null
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/changelog
@@ -0,0 +1,5 @@
+tdeknighttour-trinity (0.1.0-0debian) testing; urgency=low
+
+  * Initial version for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Fri, 14	Mar 2025 14:18:00 +0900
diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/compat b/ubuntu/_base/applications/games/tdeknighttour/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/control b/ubuntu/_base/applications/games/tdeknighttour/debian/control
new file mode 100644
index 000000000..2736c0145
--- /dev/null
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/control
@@ -0,0 +1,16 @@
+Source: tdeknighttour-trinity
+Section: games
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+
+Package: tdeknighttour-trinity
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: A logic game for TDE.
+ A knight's tour is a sequence of moves of a knight on a chessboard such that 
+ the knight visits every square exactly once. If the knight ends on a square 
+ that is one knight's move from the beginning square (so that it could tour 
+ the board again immediately, following the same path), the tour is closed 
+ (or re-entrant); otherwise, it is open.
diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/copyright b/ubuntu/_base/applications/games/tdeknighttour/debian/copyright
new file mode 100644
index 000000000..c9b6db11d
--- /dev/null
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/copyright
@@ -0,0 +1 @@
+Denis Kozadaev (denis@tambov.ru)
diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/docs b/ubuntu/_base/applications/games/tdeknighttour/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series b/ubuntu/_base/applications/games/tdeknighttour/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/patches/series
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/games/tdeknighttour/debian/rules
index edb9f2f68..b2d712d83 100755
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/rules
@@ -1,13 +1,16 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format b/ubuntu/_base/applications/games/tdeknighttour/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/source/format
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/games/tdeknighttour/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
+++ b/ubuntu/_base/applications/games/tdeknighttour/debian/source/options
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/versions.pl b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/compat b/ubuntu/_base/applications/games/tdepacman/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/compat
+++ b/ubuntu/_base/applications/games/tdepacman/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/control b/ubuntu/_base/applications/games/tdepacman/debian/control
index 95a24c9ca..7ad7ef777 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/control
+++ b/ubuntu/_base/applications/games/tdepacman/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev
 Standards-Version: 0.3.2
 
 Package: tdepacman-trinity
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/rules b/ubuntu/_base/applications/games/tdepacman/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/games/tdepacman/debian/rules
+++ b/ubuntu/_base/applications/games/tdepacman/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/NEWS b/ubuntu/_base/applications/graphics/digikam/debian/NEWS
deleted file mode 100644
index a90a3b444..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/NEWS
+++ /dev/null
@@ -1,8 +0,0 @@
-digikam (2:0.9.2~beta1-2) unstable; urgency=low
- 
-  * Upstream have merged the digikamimageplugins with digikam
-  and all are provided in the one application package, digikam.
-  Don't be concerned that this version of digikam Conflicts:/
-  Replaces: digikamimageplugins
-
- -- Mark Purcell <msp@debian.org>  Sun, 20 May 2007 08:35:22 +0100
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/README.Debian b/ubuntu/_base/applications/graphics/digikam/debian/README.Debian
deleted file mode 100644
index 351a34b1f..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/README.Debian
+++ /dev/null
@@ -1,146 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
-	<debian-kde@lists.debian.org>	mailing list
-	#debian-kde			on irc
-
-Packaging queries
-	<debian-qt-kde@lists.debian.org>  mailing list
-	#debian-qt-kde			  on irc
-
-Maintainers
-	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
-
-
-2. Subversion repository
-------------------------
-  
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
-	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must 
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
-release is made.
-
-When, at some point, the need to have two different versions at the same time 
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and 
-if a new unstable package needs to be cooked, copying 
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-	
-	% svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-	
-	% svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
-	% svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
-	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're 
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is 
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
-        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive.  Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory.  The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
-
-6. Versioning
--------------
-
-As the autobuilder and fellow developers will need to differentiate between
-versions that are uploaded into debian already and those which will be at a
-later point, do use the UNRELEASED distribution until the time you actually do
-upload to incoming. Whoever is not a DD himself should let the sponsor do that
-final step if that sponsor has SVN commit rights to the kde-extras archive.
-
-The autobuilder packs can be found at http://kde-extras.buildserver.net/.
-The logs can be found at http://status.buildserver.net/.
-
-As the archive runs britney, it may well be that a built and installed package
-is not appearing to the archive until its reverse depends are (re)built too. In
-case of questions, feel free to mail kilian@debian.org.
-
-7. Automatic Backport hooks
----------------------------
-
-The checkout script for putting together the sources can run a backports hook
-for certain dists (like Debian sarge) which need certain adjustments to the
-source like altered Build-Depends. This hook is a plain shell script (or
-makefile like debian/rules) which needs to be put in the debian/backports
-directory and made executable by means of the svn properties set. The codenames
-for the current dists are: sid, etch, sarge, edgy and dapper. For an example
-see asterisk-addons/trunk/debian/backports/sarge which may be more illustrating
-what to do.
-
-8. Autotools, libtool, am_maintainer, buildprep and configure updates
----------------------------------------------------------------------
-
-Achim, Please add some text in here to document when it is necessary and
-how we update the build enviroment for a package.
-
--(snip)-
-
-In case any of the above is unclear to you or seems outdated, please drop us a
-note to the maintainers list.
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/clean b/ubuntu/_base/applications/graphics/digikam/debian/clean
deleted file mode 100644
index d0ada902a..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-po/*/*.gmo
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/compat b/ubuntu/_base/applications/graphics/digikam/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/compat
+++ b/ubuntu/_base/applications/graphics/digikam/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control
index cf999e44c..a94a071d2 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/control
+++ b/ubuntu/_base/applications/graphics/digikam/debian/control
@@ -4,12 +4,11 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng-dev, libexiv2-dev,
- libkdcraw3-trinity-dev (>= 0.1.4),
- automake, autoconf, libtool, libltdl-dev
+ libkdcraw3-trinity-dev (>= 0.1.4)
 Standards-Version: 3.8.4
 Homepage: http://www.digikam.org
 
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
index 31f007655..8603683fc 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
@@ -1 +1 @@
-opt/trinity/share/doc/tde/HTML
+/opt/trinity/share/doc/tde/HTML
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
index 26e2288f9..223a24aa6 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
@@ -1,12 +1,13 @@
-opt/trinity/bin/digi*
-/opt/trinity/include/tde
-opt/trinity/lib
+/opt/trinity/bin/digi*
+/opt/trinity/include
+/opt/trinity/lib
 /opt/trinity/share/apps/digikam
 /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop
 /opt/trinity/share/applications/tde/digikam.desktop
 /opt/trinity/share/icons/hicolor/*/apps/digikam.png
 /opt/trinity/share/locale
+/opt/trinity/share/man/man1/digikam.1
+/opt/trinity/share/man/man1/digitaglinktree.1
+/opt/trinity/share/pixmaps/digikam*.xpm
 /opt/trinity/share/servicetypes/digikamimageplugin.desktop
 /opt/trinity/share/services
-debian/xpm.d/digikam.xpm /opt/trinity/share/pixmaps/
-debian/xpm.d/digikam-16.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
deleted file mode 100644
index 59b14fa47..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-# libdigikam.so is no 'proper' shared library.  It's contents
-# changes as needed. Upstream does not support any use beside
-# for digikam and digikamimageplugins (that are released to-
-# gether when the API changes). Therefore we did not split out a
-# libdigikam and libdigikam-dev pkgs.  For further discussion
-# see bug report #324592
-#
-digikam-trinity: non-dev-pkg-with-shlib-symlink 
-digikam-trinity: package-name-doesnt-match-sonames
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
deleted file mode 100644
index 4e21f2805..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/digikam.manpage
-debian/tmp/opt/trinity/share/man/man1/digitaglinktree.1
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage b/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
deleted file mode 100644
index 539fd026a..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
+++ /dev/null
@@ -1,74 +0,0 @@
-.TH digikam "1" "Feb 2005" "digikam 0.7.4" "User Commands"
-.SH NAME
-digikam \- digital photo management application for TDE
-.SH SYNOPSIS
-.B digikam
-[\fIQt\-options\fR] [\fITDE\-options\fR]
-[\fB\-\-detect\-camera\fR]
-.SH DESCRIPTION
-Digikam is an easy to use and powerful digital photo management
-application, which makes importing, organizing and editing
-digital photos a "snap".  An easy to use interface is provided
-to connect to your digital camera, preview the images and download
-and/or delete them.
-.PP
-Digikams buildin image editor makes the common photo correction
-a simple task.  The image editor is extensible via plugins.
-The digikam package contains already many useful image editor plugins.
-.PP
-Digikam can also make use of the KIPI image handling plugins to
-extend it's capabilities even further for photo manipulations,
-im- and export, etc.  The kipi-plugins package contains many
-very useful extentions.
-.PP
-.SS "Options:"
-.TP
-\fB\-\-detect\-camera\fR
-Automatically detect and open picture download dialog. Note:
-autodetection does not work with cameras that claim to be
-USB mass storage devices.
-.TP
-\fB\-\-download\-from  <path>\fR
-Open camera dialog at <path>. Use this with cameras that export
-their pictures as USB mass storage.  TDE automounts the camera
-storage, if the path given as, e.g., \fIsystem:/media/<dir>\fR or \fImedia:/<dir>\fR
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B digikam
-is maintained as a html manual in the package digikam-doc. The command
-.IP
-.B khelpcenter help:/digikam
-.PP
-gives you access to the complete manual.
-.SH AUTHOR
-.B digikam
-was written by Renchi Raju and many others (see
-/usr/share/doc/digikam/AUTHORS for details).
-.PP
-This manual page was prepared by Achim Bohnet <ach@mpe.mpg.de> for the Debian
-GNU/Linux  system (but may be used by others).
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules
index 99e80d2fc..d8f798f1c 100755
--- a/ubuntu/_base/applications/graphics/digikam/debian/rules
+++ b/ubuntu/_base/applications/graphics/digikam/debian/rules
@@ -1,41 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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)
-
-TARBALL_EXT=tar.bz2
-
-DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib)
-
-PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-binary-install/digikam-trinity-doc::
-	# remove empty API-docs dirs tree
-	rm -rf $(CURDIR)/debian/digikam-trinity-doc/opt/trinity/share/doc/tde/HTML/en/digikam-apidocs
-
-binary-install/digikam-trinity::
-	mv debian/digikam-trinity/usr/share/man debian/digikam-trinity/opt/trinity/share/
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/graphics/digikam/debian/showfoto-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
index 73ba9c643..4bda8ae8e 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
+++ b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
@@ -1,6 +1,6 @@
-opt/trinity/bin/showfoto
+/opt/trinity/bin/showfoto
 /opt/trinity/share/apps/showfoto
 /opt/trinity/share/applications/tde/showfoto.desktop
 /opt/trinity/share/icons/hicolor/*/apps/showfoto.png
-debian/xpm.d/showfoto.xpm /opt/trinity/share/pixmaps/
-debian/xpm.d/showfoto-16.xpm /opt/trinity/share/pixmaps/
+/opt/trinity/share/man/man1/showfoto.1
+/opt/trinity/share/pixmaps/showfoto*.xpm
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
deleted file mode 100644
index d8fce4f22..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH SHOWFOTO 1 "Feb 2005" "Trinity Desktop Environment" "digiKam Photo Viewer"
-.SH NAME
-showfoto
-\- digiKam Photo Viewer
-.SH SYNOPSIS
-showfoto [Qt\-options] [TDE\-options] [file(s)] 
-.SH DESCRIPTION
-digiKam Photo Viewer
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   File(s) to open
-.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
-.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:/showfoto/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/showfoto/'"
-from the command-line. (Note: The handbook is in the package digikam-doc.)
-.br
-.SH AUTHORS
-.nf
-Renchi Raju <renchi at pooh.tam.uiuc.edu>
-.br
-Caulier Gilles <caulier dot gilles at free.fr>
-.br
-Ralf Holzer <kde at ralfhoelzer.com>
-.br
-.br
-This manual page was prepared by Achim Bohnet <ach@mpe.mpg.de> for the Debian
-GNU/Linux  system (but may be used by others).
-
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
deleted file mode 100644
index e146c959f..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/showfoto-trinity.manpage
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/watch b/ubuntu/_base/applications/graphics/digikam/debian/watch
deleted file mode 100644
index 16e6d05c4..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
deleted file mode 100644
index 5820677d7..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
+++ /dev/null
@@ -1,156 +0,0 @@
-/* XPM */
-static char *digikam-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 134 2",
-"   c black",
-".  c gray1",
-"X  c #090909",
-"o  c #151515",
-"O  c #161616",
-"+  c gray9",
-"@  c #191919",
-"#  c gray10",
-"$  c gray11",
-"%  c #202020",
-"&  c gray13",
-"*  c #252525",
-"=  c #282828",
-"-  c gray16",
-";  c gray17",
-":  c #2C2C2C",
-">  c gray18",
-",  c #2F2F2F",
-"<  c #313131",
-"1  c #343434",
-"2  c #353535",
-"3  c gray25",
-"4  c #414141",
-"5  c gray26",
-"6  c #444444",
-"7  c gray27",
-"8  c gray28",
-"9  c gray29",
-"0  c gray31",
-"q  c gray33",
-"w  c gray34",
-"e  c gray35",
-"r  c gray36",
-"t  c gray37",
-"y  c #646464",
-"u  c #656565",
-"i  c #686868",
-"p  c DimGray",
-"a  c #6A6A6A",
-"s  c gray42",
-"d  c #6C6C6C",
-"f  c #6F6F6F",
-"g  c #717171",
-"h  c #727272",
-"j  c gray45",
-"k  c gray46",
-"l  c #767676",
-"z  c #777777",
-"x  c gray47",
-"c  c #7B7B7B",
-"v  c gray49",
-"b  c #7E7E7E",
-"n  c gray50",
-"m  c #808080",
-"M  c gray51",
-"N  c #838383",
-"B  c gray53",
-"V  c #898989",
-"C  c gray54",
-"Z  c #8B8B8B",
-"A  c gray56",
-"S  c gray57",
-"D  c #939393",
-"F  c #979797",
-"G  c #989898",
-"H  c #9B9B9B",
-"J  c gray61",
-"K  c gray62",
-"L  c #A0A0A0",
-"P  c gray63",
-"I  c #A2A2A2",
-"U  c #A4A4A4",
-"Y  c #A5A5A5",
-"T  c gray65",
-"R  c #A7A7A7",
-"E  c gray66",
-"W  c #A9A9A9",
-"Q  c #AAAAAA",
-"!  c gray67",
-"~  c #ACACAC",
-"^  c gray68",
-"/  c #AEAEAE",
-"(  c #AFAFAF",
-")  c gray69",
-"_  c #B2B2B2",
-"`  c #B4B4B4",
-"'  c #B6B6B6",
-"]  c #B7B7B7",
-"[  c gray72",
-"{  c #B9B9B9",
-"}  c #BBBBBB",
-"|  c gray",
-" . c gray75",
-".. c #C3C3C0",
-"X. c #C3C3C3",
-"o. c gray77",
-"O. c #C5C5C5",
-"+. c #C6C6C6",
-"@. c gray78",
-"#. c #C8C8C8",
-"$. c gray79",
-"%. c #CBCBCB",
-"&. c gray80",
-"*. c #CDCDCD",
-"=. c #CECECE",
-"-. c gray81",
-";. c gray82",
-":. c #D2D2D2",
-">. c LightGray",
-",. c gray83",
-"<. c #D5D5D5",
-"1. c gray84",
-"2. c #D8D8D8",
-"3. c gray85",
-"4. c #DADADA",
-"5. c gray86",
-"6. c gainsboro",
-"7. c #DDDDDD",
-"8. c gray87",
-"9. c #DFDFDF",
-"0. c gray88",
-"q. c #E2E2E2",
-"w. c #E4E4E4",
-"e. c #EAEAEA",
-"r. c #ECECEC",
-"t. c gray94",
-"y. c #F3F3F3",
-"u. c #F4F4F4",
-"i. c gray96",
-"p. c #F6F6F6",
-"a. c #F9F9F9",
-"s. c #FBFBFB",
-"d. c gray100",
-"f. c None",
-/* pixels */
-"f.f.f.f.n w s g u 4 t f.f.f.f.f.",
-"f.f.f.~ I @...@.} ] i < f.f.f.f.",
-"f.f.,.| ] ,.w.N ,./ C 3 - f.f.f.",
-"f.@.4.~ @.@.} %.R n f 4 O f.f.f.",
-"f.0.%.z 0.e C ,.0 s x @ X @ f.f.",
-"f.0.~ 8 e.e.7.,.,.} n     O f.f.",
-"z @.Q N } :.:...:.:.S g x _ ~ s ",
-"M a.~ K ] 7.p.p.p.p.y.y.d.K 8 O ",
-"n :.c y.} @.-.,.,.%.%.%.K 1 8 @ ",
-"z Q Q Q R ` G 6 , u ~ R K C G 0 ",
-"n Q I Q I -.= % 2 $ f Q ~ ~ _ x ",
-"S 2.4.4.5.` % q I x t ..8.7.7.~ ",
-"C @.@.@.@.@.9 8 B ~ M I } ] ] Z ",
-"n 7.8.8.8.5.~ M j S B 4.0.8.7.z ",
-"z K K U K U K A N Z H U R I I s ",
-"2 , , , , , < : : : , - : : * . "
-};
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
deleted file mode 100644
index 88a2f7df2..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
+++ /dev/null
@@ -1,257 +0,0 @@
-/* XPM */
-static char *digikam[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 219 2",
-"   c black",
-".  c #020202",
-"X  c gray1",
-"o  c gray2",
-"O  c #070707",
-"+  c gray3",
-"@  c #090909",
-"#  c gray4",
-"$  c #0B0B0B",
-"%  c gray6",
-"&  c #101010",
-"*  c gray7",
-"=  c #131313",
-"-  c gray8",
-";  c #151515",
-":  c #161616",
-">  c gray9",
-",  c #181818",
-"<  c gray10",
-"1  c #1B1B1B",
-"2  c gray11",
-"3  c #1E1E1E",
-"4  c gray12",
-"5  c #202020",
-"6  c gray13",
-"7  c #222222",
-"8  c gray14",
-"9  c #252525",
-"0  c gray15",
-"q  c #282828",
-"w  c #2A2A2A",
-"e  c gray17",
-"r  c #2C2C2C",
-"t  c #2D2D2D",
-"y  c gray18",
-"u  c #2F2F2F",
-"i  c gray19",
-"p  c #323232",
-"a  c #343434",
-"s  c #353535",
-"d  c gray21",
-"f  c #373737",
-"g  c gray22",
-"h  c #3A3A3A",
-"j  c gray23",
-"k  c #3C3C3C",
-"l  c gray24",
-"z  c #3F3F3F",
-"x  c #414141",
-"c  c #434343",
-"v  c #444444",
-"b  c gray27",
-"n  c #464646",
-"m  c #484848",
-"M  c #494949",
-"N  c gray29",
-"B  c #4B4B4B",
-"V  c #4C4C4C",
-"C  c gray30",
-"Z  c gray31",
-"A  c #505050",
-"S  c #515151",
-"D  c gray32",
-"F  c #535353",
-"G  c gray33",
-"H  c #555555",
-"J  c #565656",
-"K  c gray34",
-"L  c #585858",
-"P  c gray35",
-"I  c #5A5A5A",
-"U  c gray36",
-"Y  c #5D5D5D",
-"T  c gray37",
-"R  c #5F5F5F",
-"E  c #606060",
-"W  c gray38",
-"Q  c gray39",
-"!  c #656565",
-"~  c gray40",
-"^  c #676767",
-"/  c DimGray",
-"(  c #6A6A6A",
-")  c gray42",
-"_  c #6D6D6D",
-"`  c gray43",
-"'  c #6F6F6F",
-"]  c gray44",
-"[  c #727272",
-"{  c gray45",
-"}  c #747474",
-"|  c gray46",
-" . c #767676",
-".. c #777777",
-"X. c gray47",
-"o. c #797979",
-"O. c gray48",
-"+. c #7B7B7B",
-"@. c #7C7C7C",
-"#. c #7E7E7E",
-"$. c #818181",
-"%. c gray51",
-"&. c #838383",
-"*. c #848484",
-"=. c gray52",
-"-. c #868686",
-";. c gray53",
-":. c #888888",
-">. c gray54",
-",. c #8B8B8B",
-"<. c gray55",
-"1. c #8D8D8D",
-"2. c #8E8E8E",
-"3. c gray56",
-"4. c #909090",
-"5. c gray57",
-"6. c #929292",
-"7. c #939393",
-"8. c gray58",
-"9. c #959595",
-"0. c gray59",
-"q. c #979797",
-"w. c #989898",
-"e. c gray60",
-"r. c #9A9A9A",
-"t. c #9B9B9B",
-"y. c gray61",
-"u. c #9D9D9D",
-"i. c gray62",
-"p. c #9F9F9F",
-"a. c #A0A0A0",
-"s. c gray63",
-"d. c #A2A2A2",
-"f. c gray64",
-"g. c #A4A4A4",
-"h. c #A5A5A5",
-"j. c gray65",
-"k. c #A7A7A7",
-"l. c gray66",
-"z. c #A9A9A9",
-"x. c #AAAAAA",
-"c. c gray67",
-"v. c #ACACAC",
-"b. c gray68",
-"n. c #AEAEAE",
-"m. c #AFAFAF",
-"M. c gray69",
-"N. c #B1B1B1",
-"B. c #B2B2B2",
-"V. c gray70",
-"C. c #B4B4B4",
-"Z. c #B7B7B7",
-"A. c gray72",
-"S. c #B9B9B9",
-"D. c gray73",
-"F. c #BBBBBB",
-"G. c #BCBCBC",
-"H. c gray74",
-"J. c gray",
-"K. c gray75",
-"L. c #C0C0C0",
-"P. c #C1C1C1",
-"I. c gray76",
-"U. c #C3C3C3",
-"Y. c gray77",
-"T. c #C5C5C5",
-"R. c #C6C6C6",
-"E. c gray78",
-"W. c #C8C8C8",
-"Q. c gray80",
-"!. c #CDCDCD",
-"~. c #CECECE",
-"^. c gray81",
-"/. c #D0D0D0",
-"(. c gray82",
-"). c #D2D2D2",
-"_. c LightGray",
-"`. c gray83",
-"'. c #D5D5D5",
-"]. c gray84",
-"[. c #D7D7D7",
-"{. c #D8D8D8",
-"}. c gray85",
-"|. c #DADADA",
-" X c gray86",
-".X c gainsboro",
-"XX c #DDDDDD",
-"oX c gray87",
-"OX c #DFDFDF",
-"+X c gray88",
-"@X c #E1E1E1",
-"#X c #E2E2E2",
-"$X c gray89",
-"%X c #E4E4E4",
-"&X c gray90",
-"*X c #E6E6E6",
-"=X c #E7E7E7",
-"-X c gray91",
-";X c #E9E9E9",
-":X c #EAEAEA",
-">X c gray92",
-",X c #ECECEC",
-"<X c gray93",
-"1X c gray94",
-"2X c #F1F1F1",
-"3X c gray95",
-"4X c #F3F3F3",
-"5X c #F4F4F4",
-"6X c gray96",
-"7X c #F6F6F6",
-"8X c #F8F8F8",
-"9X c #F9F9F9",
-"0X c gray98",
-"qX c #FBFBFB",
-"wX c gray99",
-"eX c #FDFDFD",
-"rX c #FEFEFE",
-"tX c gray100",
-"yX c None",
-/* pixels */
-"yXyXyXyXyXyXyXyXyXyX*.T n z j f j M W yXyXyXyXyXyXyXyXyXyXyXyXyX",
-"yXyXyXyXyXyXyXyX*.G x W &.g.T.V.2.( V f V yXyXyXyXyXyXyXyXyXyXyX",
-"yXyXyXyXyXyXyX*.V ( I.T.T.W.W.W.W.T.T.2.z j yXyXyXyXyXyXyXyXyXyX",
-"yXyXyXyXyXyX6.W k.v.V.d.6.k.v.v.k.&.6.k.k.M f V yXyXyXyXyXyXyXyX",
-"yXyXyXyXyXd...e.0.e.D.@X,X6.#.*.#.:XT.[ 2.2.y p yXyXyXyXyXyXyXyX",
-"yXyXyXyXv.e.0.6.#.T.tXtXtXtXe.G tXtXtX}.~ [ ( 4 y yXyXyXyXyXyXyX",
-"yXyXyXyXv.>.6.' e.7XtX:X@XtXtXd.tX,XG.tXX.G G 5 0 yXyXyXyXyXyXyX",
-"yXyXyXD.v.&...V W.tXv.4 1 >.tXk._.4 # I V.j z 0 O 0 yXyXyXyXyXyX",
-"yXyXv.I.d...A e oXtXG I 0.j tXg.( X...4 :Xe 4 1   1 > yXyXyXyXyX",
-"yXyXD.T.6.T p 5 ,XtX[     A tXg.u.    f tXe O     O 4 yXyXyXyXyX",
-"yXyXT.G.*.V > 0 7XtX1X~ T @XtXk.tX..V I.tXp         4 yXyXyXyXyX",
-"yXyXW.v...z O # :XtXtXtXtXtXtXg.tXtXtXtXtX0         >   yXyXyXyX",
-"> A 6.&.T j 1 1 g.I.I.I.I.I.I.>.I.I.T.T.D.5 > = = = f /.T.v.yXyX",
-"j g.:X:X:X:X:X:X:X:X:X*X:X*X*X*X*X*X*X*X*X*X*X*X*X1X}.d...( W yX",
-"' v.tXtXW.v.v.V.D.G.:XtXtXtXtXtX7XtXtXtXtX7XtXtXtX/.0.~ f # y   ",
-"0.k.7X7X*.I.g.}.1XT./.7X1X7X1X7X7X7X7X1X7X7X1X1X@X>.I e     5   ",
-"u.d.*X*Xe.:X7XtX7X@XoX@X*X@X@X@X@X@X@X@XoX@X@X@XV.V 4     5 1   ",
-"u.0././.v.T.:X*X:XtX@X!.!._.@X*X@X@X_.!.!.!.W.!.v.y O y n X.x   ",
-"e.2.G.G.G.G.G.G.G.G.G.G.oX:X*.V n G &._.G.D.D.D.V.*.' *.2.e.T   ",
-"e.&.v.v.k.k.k.k.k.k.g.oX@Xf 4 = % # > G d.k.g.g.k.k.u.u.g.k.[   ",
-"e.>.V.v.V.v.V.V.V.V.!.@Xj > 4 y f y 1   ~ e.V.V.V.V.V.V.V.V.&.  ",
-"e.e.d.u.d.u.e.e.e.e._.D.0 5 n g.>.T M 1 O 0.d.k.g.k.k.v.v.v.g.O ",
-"e.V.7X7X7X7X7X7X7X7X:X~ > e G v.g.*...z   2.V.1X1X1X1X1X1X1XI.O ",
-"e.G.}.}.}.}.}.}.}.oX@X2.0 p A ..0.d.e.T   d.6.oXoXoX}.oXoX}./.O ",
-"0.W.1X1X1X1X1X7X7X1X:XG.M 5 x ~ >.g.V.  M 0.D.7X7X7X7X7X7X7XoX  ",
-"0.d.}._._.}._._._._.}.T.2.n 4 j G (   j v.G g._._./._._._._.g.O ",
-"0.e._._.}._.}.}.}.}.}.T.k.u...~ I ' 2.k.M 2.I.}.}.}.}.}.}.}.e.O ",
-"0.u.@XoXoXoXoX@XoX@XoXoXI.2.>.2.0.[ G W 6.g.@X@X@X@XoX@X@XoXu.O ",
-"0.e.}.}.}.}.}.}.}.}.}.oX}./.g.#.' X.2.2.k._.}.}.}.}._.}.}.}.0.O ",
-"0.#.*.>.*.>.*.>.>.>.>.*.>.*.>.>.&.&.*.*.>.>.2.>.>.>.2.2.>.>...= ",
-"x G G A G A A G A G A A A A G A A A A A A A A A A A A A V n 1   ",
-"                                                                "
-};
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
deleted file mode 100644
index 7425c5ba7..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
+++ /dev/null
@@ -1,195 +0,0 @@
-/* XPM */
-static char *showfoto-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 173 2",
-"   c black",
-".  c #020202",
-"X  c #252525",
-"o  c gray20",
-"O  c #2D3744",
-"+  c #3F4142",
-"@  c gray25",
-"#  c #404246",
-"$  c #44494E",
-"%  c #484848",
-"&  c #4E4E4E",
-"*  c #4F5153",
-"=  c #515151",
-"-  c gray32",
-";  c #535454",
-":  c #565656",
-">  c gray34",
-",  c #585858",
-"<  c gray35",
-"1  c #5A5A5A",
-"2  c #5D6D7F",
-"3  c #626262",
-"4  c #646464",
-"5  c #656565",
-"6  c gray40",
-"7  c #676767",
-"8  c gray42",
-"9  c #6F6F6F",
-"0  c #717171",
-"q  c #737071",
-"w  c #757676",
-"e  c gray48",
-"r  c #7C7C7C",
-"t  c #7E7E7E",
-"y  c #5E7085",
-"u  c #5771A4",
-"i  c #658193",
-"p  c #6E99B9",
-"a  c #5C8CCA",
-"s  c #568BDB",
-"d  c #6D9FEF",
-"f  c #6BACE4",
-"g  c #6FB9FE",
-"h  c #75ACF8",
-"j  c #77BAEF",
-"k  c #75B7F6",
-"l  c #73B7F9",
-"z  c #72B8FE",
-"x  c #72BBFC",
-"c  c #7DB7F5",
-"v  c #77C3FE",
-"b  c #808080",
-"n  c #838383",
-"m  c #868B8E",
-"M  c #878C8F",
-"N  c #8A8A8B",
-"B  c #80909C",
-"V  c #88939A",
-"C  c #8F969F",
-"Z  c #95938F",
-"A  c #929291",
-"S  c #929292",
-"D  c #939196",
-"F  c #939496",
-"G  c gray59",
-"H  c #979797",
-"J  c #989596",
-"K  c #9A9A9A",
-"L  c gray61",
-"P  c #8BA4B2",
-"I  c #9EA8B3",
-"U  c gray63",
-"Y  c #A1A2A2",
-"T  c gray64",
-"R  c #A4A4A4",
-"E  c #A5A5A5",
-"W  c gray65",
-"Q  c #A7A7A7",
-"!  c #A4A6A8",
-"~  c #A9A9A9",
-"^  c #A8A9AA",
-"/  c gray68",
-"(  c #AFAFAF",
-")  c gray69",
-"_  c #B2B2B2",
-"`  c #B6B6B6",
-"'  c #B6B6B7",
-"]  c #B7B7B7",
-"[  c #B5B7B9",
-"{  c gray72",
-"}  c gray73",
-"|  c #BBBBBB",
-" . c #BEBCBB",
-".. c gray74",
-"X. c gray",
-"o. c #8DBDF2",
-"O. c #A4BEE5",
-"+. c #86C3FC",
-"@. c #89CDFC",
-"#. c #92C2F3",
-"$. c #ADCCEF",
-"%. c #A4CCF4",
-"&. c #A3CFFA",
-"*. c #A9CDF3",
-"=. c #BED0E5",
-"-. c #BCD7E4",
-";. c #B0D2F4",
-":. c #C0C0C0",
-">. c #C0C1C1",
-",. c #C1C1C1",
-"<. c gray76",
-"1. c #C3C3C3",
-"2. c gray77",
-"3. c #C6C6C6",
-"4. c gray78",
-"5. c #C8C8C8",
-"6. c gray79",
-"7. c #CACACA",
-"8. c #CBCBCB",
-"9. c #C9CCCE",
-"0. c #CBCDCE",
-"q. c gray80",
-"w. c #CDCDCD",
-"e. c #CECECE",
-"r. c gray81",
-"t. c #D2D2D2",
-"y. c LightGray",
-"u. c gray83",
-"i. c #D5D5D5",
-"p. c #D7D7D7",
-"a. c #D7D9DC",
-"s. c #D6DADE",
-"d. c #D8D8D8",
-"f. c gray85",
-"g. c gainsboro",
-"h. c #DDDEDF",
-"j. c #DFDFDF",
-"k. c #C3DAF4",
-"l. c #C7E5F7",
-"z. c #CDE0F3",
-"x. c #DCE3E8",
-"c. c #DCE4EE",
-"v. c #D8E5F4",
-"b. c #DCE7F1",
-"n. c #DBE9F6",
-"m. c gray88",
-"M. c #E2E2E2",
-"N. c #E4E4E4",
-"B. c #E4E5E5",
-"V. c gray90",
-"C. c #E5E6E7",
-"Z. c #E6E6E6",
-"A. c #E2E6EB",
-"S. c #E7E7E8",
-"D. c #E9E9E9",
-"F. c gray92",
-"G. c #EAECEE",
-"H. c #EBEDEE",
-"J. c #EBEEEF",
-"K. c #ECECEC",
-"L. c gray93",
-"P. c #EEEFEF",
-"I. c #E1E9F2",
-"U. c #E3EAF2",
-"Y. c #E5EEF6",
-"T. c #E9EDF1",
-"R. c #EDF0F3",
-"E. c #EFF0F0",
-"W. c #EEF1F3",
-"Q. c #ECF1F6",
-"!. c #EDF1F6",
-"~. c #F2F3F5",
-"^. c None",
-/* pixels */
-"^.^.D.D.H.M.q.^.^.^.^.^.^.^.^.^.",
-"^.^.D.~.W.W.T.H.H.V.r.^.^.^.^.^.",
-"^.:.C.n.%.;.z.Y.W.W.H.V.K.P.V.d.",
-"^.i.H.l.@.v x k #.*.k.v.U.T.H.h.",
-"^.j.H.-.P V M B p f l c o.$.U.p.",
-"^.j.h.D J ` U ~ N i k x x +.b.4.",
-"~ d.X.q ` { X./ t + u d h &.x.' ",
-"X.r.Z & { e _ e 7 X O a s O.a.~ ",
-"L | S 8 r.q.t.7./ > * I =.c.8.0 ",
-"` 3.:.{ p.V.V.V.M.q.N $ y A.[ o ",
-"0.( :.i.d.q.:.` X.X.7 + y s.W ^.",
-"[ W { { X.W 9 > 8 R ~ U C 0.K ^.",
-"W _ 7.7.3.t 7 9 % G 7.3.~ :.b ^.",
-"F [ i.p.t.K : : < W d.i.U K @ ^.",
-"w Q :.3.:._ n 8 t _ :.:.S - ^.^.",
-"; 3 3 7 7 7 < - < 3 7 7 - ^.^.^."
-};
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
deleted file mode 100644
index ef7ea08fa..000000000
--- a/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
+++ /dev/null
@@ -1,199 +0,0 @@
-/* XPM */
-static char *showfoto[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 161 2",
-"   c #000000",
-".  c #0B0B0B",
-"X  c #131313",
-"o  c #15191D",
-"O  c #1A1A1A",
-"+  c #1F262E",
-"@  c #232323",
-"#  c #2D2D2D",
-"$  c #323232",
-"%  c #353739",
-"&  c #3C3C3C",
-"*  c #343351",
-"=  c #434343",
-"-  c #4A4A4A",
-";  c #4A4D53",
-":  c #555555",
-">  c #5B5B5B",
-",  c #515962",
-"<  c #626262",
-"1  c #616669",
-"2  c #6C6C6C",
-"3  c #717171",
-"4  c #777778",
-"5  c #72787B",
-"6  c #7A7A7A",
-"7  c #3774C6",
-"8  c #4C6D91",
-"9  c #4B6E9C",
-"0  c #5A7C98",
-"q  c #4975AA",
-"w  c #6A7A80",
-"e  c #727C81",
-"r  c #7B7ADB",
-"t  c #5F89B7",
-"y  c #6B8089",
-"u  c #77818D",
-"i  c #708B99",
-"p  c #7D8E95",
-"a  c #7692B2",
-"s  c #71A3BE",
-"d  c #7CA0B0",
-"f  c #4283D5",
-"g  c #4F82D6",
-"h  c #568FD7",
-"j  c #4D92E5",
-"k  c #579DEC",
-"l  c #5CA2EF",
-"z  c #5AA4F6",
-"x  c #5CA6F9",
-"c  c #5FABFC",
-"v  c #648DC9",
-"b  c #638DE0",
-"n  c #6B98ED",
-"m  c #7C9FE4",
-"M  c #749DF2",
-"N  c #7C9AF9",
-"B  c #7FB8D2",
-"V  c #66A0E2",
-"C  c #67A3EA",
-"Z  c #68A4EA",
-"A  c #6FA8E7",
-"S  c #6FABEE",
-"D  c #62A9F5",
-"F  c #62ADFB",
-"G  c #69AFF7",
-"H  c #6CAFFA",
-"J  c #65B2FE",
-"K  c #68B5FF",
-"L  c #6DBBFF",
-"P  c #76A9E4",
-"I  c #76AEFF",
-"U  c #7CA9FF",
-"Y  c #7EB1EA",
-"T  c #78BFE6",
-"R  c #75B1F2",
-"E  c #71B4FF",
-"W  c #72BBFE",
-"Q  c #79BCFF",
-"!  c #73C3FF",
-"~  c #77C8FF",
-"^  c #7BCBFE",
-"/  c #838384",
-"(  c #85898C",
-")  c #8C8C8C",
-"_  c #858D95",
-"`  c #838D9B",
-"'  c #8E9091",
-"]  c #939393",
-"[  c #949698",
-"{  c #9A9A9A",
-"}  c #8EADBB",
-"|  c #A3A3A4",
-" . c #A4A6A8",
-".. c #ACACAC",
-"X. c #ADAFB1",
-"o. c #B2B2B2",
-"O. c #BBBBBB",
-"+. c #8795FE",
-"@. c #8DA5CF",
-"#. c #91B2DE",
-"$. c #82ABFE",
-"%. c #8CAEFF",
-"&. c #85B7EE",
-"*. c #84BCFF",
-"=. c #8ABDF7",
-"-. c #91B7E3",
-";. c #9DBFE6",
-":. c #9BBFE8",
-">. c #9ABDFD",
-",. c #B7BEC6",
-"<. c #86C6FF",
-"1. c #81D2FF",
-"2. c #89D5FE",
-"3. c #98C3F3",
-"4. c #9ACAFF",
-"5. c #94DBFD",
-"6. c #9DDFFF",
-"7. c #AFC1C7",
-"8. c #AACEDE",
-"9. c #A2C4EA",
-"0. c #ADC8E7",
-"q. c #A3CDFC",
-"w. c #A9D3EE",
-"e. c #A2D6F1",
-"r. c #A7D1FF",
-"t. c #A9DDF5",
-"y. c #B2CEED",
-"u. c #B8CDE5",
-"i. c #BACFEA",
-"p. c #BCD4EE",
-"a. c #B2D6FF",
-"s. c #B8D4F4",
-"d. c #B8DBFE",
-"f. c #A4E2FF",
-"g. c #B5E2FF",
-"h. c #C3C3C3",
-"j. c #CBCBCB",
-"k. c #D4D4D4",
-"l. c #DBDBDB",
-"z. c #C2D4E9",
-"x. c #C6DAEB",
-"c. c #CFDCED",
-"v. c #C5DAF1",
-"b. c #CBE4FD",
-"n. c #DBE2EC",
-"m. c #DBE9EF",
-"M. c #D6E2F1",
-"N. c #D0E3F9",
-"B. c #DAE4F4",
-"V. c #DDEEFF",
-"C. c #E3E3E3",
-"Z. c #EBEBEB",
-"A. c #E3EBF3",
-"S. c #EBEDF1",
-"D. c #ECF0F5",
-"F. c #EBF3FC",
-"G. c #F2F2F2",
-"H. c #F3F7FB",
-"J. c #F5F8FB",
-"K. c #FBFBFB",
-"L. c None",
-/* pixels */
-"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
-"L.L.L.L.L.L.h./ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
-"L.L.L.L.L.: Z.G.S.Z.C.l.j.{ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
-"L.L.L.L.L.O.J.K.K.K.J.G.S.C.j.{ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
-"L.L.L.L.L.k.K.S.9.p.B.D.K.K.K.G.Z.Z.C.C.j. .L.L.L.L.L.L.L.L.L.L.",
-"L.L.L.L.o.C.K.x.G G R &.9.i.G.K.K.K.K.G.Z.Z.k...  L.L.L.L.L.L.L.",
-"L.L.L.L.j.Z.K.w.~ W L K K F l A 9.y.M.S.K.K.K.J.Z.Z.C.C.k.O.L.L.",
-"L.L.L.L.l.G.F.e.2.2.~ ~ L L G G c D S Y 9.u.S.J.K.K.K.G.G.Z.k.o.",
-"L.L.L.L.l.G.A.t.f.f.6.2.1.^ ^ ! ! L K J c x k V -.y.c.A.G.K.C.] ",
-"L.L.L.L.C.J.m.8.} p 6 5 e i s ~ ~ ~ ! W K K J c z l C P A.J.k.< ",
-"L.L.L.L.C.K.7.w u {  ...| { / e B 2.1.1.^ ~ W W K K J J J.J...  ",
-"L.L.L.) Z.O.4 ) { | { ' ' [ ] / 1 d 5.5.2.^ H E ~ W L <.J.G.6   ",
-"L.L.L.o.l./ 6 ) j.C.k./ ] k.j.4 < ; @.>.%.$.$.U I Q ^ d.G.C.    ",
-"L.L./ O.| 4 > O.Z.k.C.k.j.k.h.| = $ * r +.N n M $.$.*.b.G.j.  L.",
-"L.L...O.) : : C.o.2 3 l.o./ & { $ @ X 0 W D j f g b m M.Z.o.  L.",
-"L.L.O...6 $ > Z./ # = j.| = X ) &     % v.d.=.Z f 7 v A.C.{ L.L.",
-"{ ..O.| < O < G.j.2 | C.h./ 2 j.=     X ,.F.H.F.N.y.i.G.k.6 L.L.",
-") 6 o.] > O > C.G.C.Z.l.j.Z.Z.l.= . . o _ p.b.V.F.F.F.Z.h.< L.L.",
-"{ ] o.O...] ..k.k.k.k.k.j.l.k.j.| ] ] ) ' u a 3.r.a.D.S.| . L.L.",
-"o.o.C.Z.O.O.j.j.l.G.G.Z.G.G.G.G.Z.Z.C.{ : + + t *.4.G.Z.4   L.L.",
-"h...l.k...k.Z.l.l.l.C.l.l.l.C.l.l.l...: X   o 8 H q.Z.k.X   L.L.",
-"O.{ h.h.h.C.Z.Z.k.j.k.k.k.j.j.h.h.h.) # O $ > q Z s.Z.h.  L.L.L.",
-"..] ....o.o.O.o.o.j.j./ > > / ......| / 6 ) ( 9 h z.C. .  L.L.L.",
-" .] o.o.o.o.o.o.h.h.> & & # @ : | ..o.....o.| ` #.n.l.{   L.L.L.",
-"{ { h.j.j.j.h.j.l./ # 3 ] 2 & X 4 O.h.j.h.j.o.{ Z.Z.j./ L.L.L.L.",
-"{ { j.j.j.j.j.k.l.3 $ 2 ] ] > O < o.j.j.j.j.O.] C.C.h.1 L.L.L.L.",
-"' | k.k.k.l.k.k.k.) $ - 3 / - # 2 o.k.k.k.k.h.< { o.{ # L.L.L.L.",
-") { j.k.k.k.k.k.k...2 # # # $ < 3 O.k.l.k.l.h.< . - >   L.L.L.L.",
-"6 { k.l.C.l.l.l.l.j.| / 2 2 3 2 | k.l.k.l.l.h.< L.L.L.L.L.L.L.L.",
-"> ] j.k.k.k.k.k.k.j.O.{ 6 4 6 ] h.k.k.k.k.j.O.> L.L.L.L.L.L.L.L.",
-"  2 3 3 3 2 2 3 3 3 3 2 3 2 2 3 3 2 3 3 3 3 < $ L.L.L.L.L.L.L.L.",
-"L.# @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ O . L.L.L.L.L.L.L.L."
-};
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
index 32ea8025c..7e8730a12 100644
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
 Standards-Version: 3.8.0
 Homepage: http://gwenview.sourceforge.net
 
@@ -13,5 +13,5 @@ Depends: gwenview-trinity (>= 1.4.2)
 Replaces: gwenview-trinity (<< 1.4.0-1)
 Description: Internationalization (i18n) for Gwenview, an image viewer for TDE
  This package provides internationalization (i18n) files (translations) for
- Gwenview, an image viewer for the Trinity Desktop Environment. See the 'gwenview'
- package description for more information.
+ Gwenview, an image viewer for the Trinity Desktop Environment. See the
+ 'gwenview-trinity' package description for more information.
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/gwenview/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control
index f5734ed43..c0f065d17 100644
--- a/ubuntu/_base/applications/graphics/gwenview/debian/control
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/control
@@ -2,9 +2,9 @@ Source: gwenview-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+               libkipi0-trinity-dev, libexiv2-dev, libmng-dev, libxcursor-dev
 Standards-Version: 3.8.4
-Homepage: http://gwenview.sourceforge.net
 
 Package: gwenview-trinity
 Architecture: any
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}
 Replaces: gwenview-kde3 (<< 4:14.0.0~), gwenview-trinity (<< 4:14.0.0~)
 Breaks: gwenview-kde3 (<< 4:14.0.0~), gwenview-trinity (<< 4:14.0.0~)
 Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity
-Suggests: gwenview-i18n
+Suggests: gwenview-i18n-trinity
 Description: image viewer for TDE
  Gwenview is an image viewer for the Trinity Desktop Environment. It features a
  folder tree window and a file list window to provide easy navigation of your
@@ -29,5 +29,5 @@ Description: image viewer for TDE
  package. The ability to perform lossless JPEG transforms is built in.
  .
  Gwenview's internationalization files (i18n) (translations) are available
- in the gwenview-i18n package. Users with non-US English desktops should
- install this package.
+ in the gwenview-i18n-trinity package. Users with non-US English desktops
+ should install this package.
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
deleted file mode 100644
index 931c8d219..000000000
--- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: gwenview-trinity
-Title: Gwenview Handbook
-Author: Aurélien Gâteau, Christopher Martin, The TDE Team
-Abstract: Gwenview is an image viewer for TDE.
-Section: Viewers
-
-Format: HTML
-Index: /opt/trinity/share/doc/tde/HTML/en/gwenview/index.html
-Files: /opt/trinity/share/doc/tde/HTML/en/gwenview/*.html
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
deleted file mode 100644
index 0e247a6ab..000000000
--- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
deleted file mode 100644
index 076efa834..000000000
--- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
+++ /dev/null
@@ -1,554 +0,0 @@
-/* XPM */
-static char * gwenview_xpm[] = {
-"32 32 519 2",
-"  	c None",
-". 	c #2D2F32",
-"+ 	c #3A3C3F",
-"@ 	c #3C3F42",
-"# 	c #333538",
-"$ 	c #5F6164",
-"% 	c #A0A2A4",
-"& 	c #CCCDCF",
-"* 	c #E3E4E5",
-"= 	c #ECEDEE",
-"- 	c #EEEFEF",
-"; 	c #E8E9EA",
-"> 	c #D7D8DA",
-", 	c #B4B6B8",
-"' 	c #7B7D80",
-") 	c #383A3D",
-"! 	c #6D7073",
-"~ 	c #CBCDCF",
-"{ 	c #F6F7F8",
-"] 	c #FEFFFF",
-"^ 	c #FEFEFE",
-"/ 	c #FCFDFE",
-"( 	c #FCFDFD",
-"_ 	c #FDFEFE",
-": 	c #E5E6E7",
-"< 	c #9DA0A2",
-"[ 	c #36383B",
-"} 	c #323539",
-"| 	c #ADB0B3",
-"1 	c #F3F5F7",
-"2 	c #FAFCFD",
-"3 	c #F7F9FA",
-"4 	c #F8FAFB",
-"5 	c #D7DADC",
-"6 	c #616468",
-"7 	c #3E4145",
-"8 	c #C6CACE",
-"9 	c #F6F9FB",
-"0 	c #F3F7F8",
-"a 	c #F3F6F8",
-"b 	c #F5F9FA",
-"c 	c #E6EAEC",
-"d 	c #74787C",
-"e 	c #32363A",
-"f 	c #C0C7CB",
-"g 	c #F1F6F8",
-"h 	c #EFF3F6",
-"i 	c #F0F5F7",
-"j 	c #E3E9EC",
-"k 	c #676C71",
-"l 	c #A2AAAF",
-"m 	c #EBF2F6",
-"n 	c #EDF3F6",
-"o 	c #EEF4F7",
-"p 	c #EFF5F7",
-"q 	c #EFF4F7",
-"r 	c #EEF4F6",
-"s 	c #EDF2F5",
-"t 	c #ECF1F4",
-"u 	c #EBF0F3",
-"v 	c #EBF0F4",
-"w 	c #ECF0F4",
-"x 	c #ECF1F5",
-"y 	c #EDF2F6",
-"z 	c #EEF3F7",
-"A 	c #EFF4F8",
-"B 	c #D1D9DD",
-"C 	c #42474B",
-"D 	c #686F73",
-"E 	c #D5DFE3",
-"F 	c #D1D8DB",
-"G 	c #C2C7CB",
-"H 	c #B1B5BA",
-"I 	c #A1A6AC",
-"J 	c #949AA0",
-"K 	c #899298",
-"L 	c #828D92",
-"M 	c #7D8C8E",
-"N 	c #798A8A",
-"O 	c #778985",
-"P 	c #778982",
-"Q 	c #788A7F",
-"R 	c #7A8B7E",
-"S 	c #7F8E82",
-"T 	c #869288",
-"U 	c #8F9991",
-"V 	c #9AA29D",
-"W 	c #A7AEAC",
-"X 	c #B6BCBD",
-"Y 	c #C7CCCF",
-"Z 	c #D4DCE1",
-"` 	c #A0A8AE",
-" .	c #110D12",
-"..	c #665A69",
-"+.	c #7E6B83",
-"@.	c #7F6C87",
-"#.	c #877993",
-"$.	c #928AA3",
-"%.	c #9E9DB2",
-"&.	c #AAAFBF",
-"*.	c #B5C0CA",
-"=.	c #BECCD2",
-"-.	c #C4D6D8",
-";.	c #C8DCDA",
-">.	c #CADED7",
-",.	c #CBDFD3",
-"'.	c #C9DECD",
-").	c #C5DBC5",
-"!.	c #C1D6BE",
-"~.	c #BBCFB5",
-"{.	c #B4C7A9",
-"].	c #AABB9A",
-"^.	c #9FAD8A",
-"/.	c #939E79",
-"(.	c #888F6B",
-"_.	c #808465",
-":.	c #787965",
-"<.	c #2F2D26",
-"[.	c #724051",
-"}.	c #AF889E",
-"|.	c #D8B3D1",
-"1.	c #ECCEED",
-"2.	c #F4E1FA",
-"3.	c #F7ECFE",
-"4.	c #F6F0FF",
-"5.	c #F3F2FF",
-"6.	c #F1F5FF",
-"7.	c #EEF7FF",
-"8.	c #ECFAFF",
-"9.	c #E9FDFF",
-"0.	c #E7FFFC",
-"a.	c #E6FFF6",
-"b.	c #E4FFF0",
-"c.	c #E3FFE9",
-"d.	c #E3FFE3",
-"e.	c #E6FFE2",
-"f.	c #E9FFE1",
-"g.	c #ECFFE0",
-"h.	c #EFFFDF",
-"i.	c #F3FFDD",
-"j.	c #F5FFDA",
-"k.	c #F6FED3",
-"l.	c #F4F7C7",
-"m.	c #EAE4B6",
-"n.	c #CFBE9B",
-"o.	c #A68269",
-"p.	c #3F1E13",
-"q.	c #6C2632",
-"r.	c #FCC0D2",
-"s.	c #FDD7EE",
-"t.	c #FFD4F8",
-"u.	c #FCCEFD",
-"v.	c #F3CEFE",
-"w.	c #EAD0FE",
-"x.	c #E1D2FE",
-"y.	c #D7D5FE",
-"z.	c #D2DCFE",
-"A.	c #CDE5FE",
-"B.	c #C9EFFE",
-"C.	c #C5F8FD",
-"D.	c #C2FDF6",
-"E.	c #C1FEE8",
-"F.	c #C0FEDA",
-"G.	c #BFFECB",
-"H.	c #BFFEBF",
-"I.	c #C5FEBD",
-"J.	c #CCFEBC",
-"K.	c #D2FEBB",
-"L.	c #DAFEBA",
-"M.	c #E1FEB8",
-"N.	c #E9FEB7",
-"O.	c #F1FEB7",
-"P.	c #F9FEB6",
-"Q.	c #FEF7BA",
-"R.	c #FDE8BF",
-"S.	c #FDD8BE",
-"T.	c #B96B57",
-"U.	c #A44855",
-"V.	c #FBB9CF",
-"W.	c #F8B6DD",
-"X.	c #FDB2EF",
-"Y.	c #FAACFC",
-"Z.	c #EDAFFE",
-"`.	c #DEB4FE",
-" +	c #CFB8FE",
-".+	c #C0BDFE",
-"++	c #B8C9FE",
-"@+	c #B2D7FE",
-"#+	c #ABE6FE",
-"$+	c #A5F6FD",
-"%+	c #A1FDF2",
-"&+	c #A0FEDD",
-"*+	c #9FFEC6",
-"=+	c #9DFEB0",
-"-+	c #9FFE9E",
-";+	c #A8FE9B",
-">+	c #B3FE9A",
-",+	c #BDFE99",
-"'+	c #C8FE98",
-")+	c #D3FE97",
-"!+	c #DFFE96",
-"~+	c #EBFE95",
-"{+	c #F7FD94",
-"]+	c #FDF297",
-"^+	c #FBDC9F",
-"/+	c #F4C39F",
-"(+	c #DC816C",
-"_+	c #220502",
-":+	c #B24A58",
-"<+	c #F69ABA",
-"[+	c #F899D1",
-"}+	c #FD92E9",
-"|+	c #F88BFB",
-"1+	c #E68FFE",
-"2+	c #D196FE",
-"3+	c #BC9DFE",
-"4+	c #A9A4FD",
-"5+	c #9DB5FE",
-"6+	c #95C9FE",
-"7+	c #8CDEFE",
-"8+	c #83F2FD",
-"9+	c #7EFDEE",
-"0+	c #7DFED1",
-"a+	c #7CFEB3",
-"b+	c #7BFE94",
-"c+	c #7DFD7D",
-"d+	c #8AFE79",
-"e+	c #99FE78",
-"f+	c #A8FE77",
-"g+	c #B7FE75",
-"h+	c #C5FE74",
-"i+	c #D5FE73",
-"j+	c #E4FE72",
-"k+	c #F5FD71",
-"l+	c #FDEE77",
-"m+	c #FBD282",
-"n+	c #EFAF7F",
-"o+	c #E1765D",
-"p+	c #2A0704",
-"q+	c #AB3849",
-"r+	c #F278A2",
-"s+	c #F67CC5",
-"t+	c #FD72E3",
-"u+	c #F669FB",
-"v+	c #DF6FFE",
-"w+	c #C578FE",
-"x+	c #AA81FD",
-"y+	c #918BFE",
-"z+	c #819FFC",
-"A+	c #74B5F5",
-"B+	c #6CD3FC",
-"C+	c #62F0FD",
-"D+	c #5CFDEA",
-"E+	c #5BFEC5",
-"F+	c #5AFE9F",
-"G+	c #58FE78",
-"H+	c #5CFE5B",
-"I+	c #6CFD56",
-"J+	c #7CF653",
-"K+	c #8FF853",
-"L+	c #A5FE53",
-"M+	c #B8FD52",
-"N+	c #CBFE51",
-"O+	c #DEFE50",
-"P+	c #F2FD4F",
-"Q+	c #FCEA56",
-"R+	c #FAC864",
-"S+	c #EB9A5E",
-"T+	c #D75E3F",
-"U+	c #210502",
-"V+	c #8F1F32",
-"W+	c #EF5488",
-"X+	c #F45FB8",
-"Y+	c #FC53DD",
-"Z+	c #F548FA",
-"`+	c #D850FE",
-" @	c #B95BFE",
-".@	c #9866FE",
-"+@	c #7770F8",
-"@@	c #506AC1",
-"#@	c #3B6FA2",
-"$@	c #3C9DC1",
-"%@	c #40E8F8",
-"&@	c #3BFEE6",
-"*@	c #3AFEBA",
-"=@	c #39FE8C",
-"-@	c #37FE5D",
-";@	c #3CFE3B",
-">@	c #44DA2F",
-",@	c #43A623",
-"'@	c #56AE24",
-")@	c #88E92F",
-"!@	c #ABFE31",
-"~@	c #C2FE30",
-"{@	c #D9FE2F",
-"]@	c #F1FD2E",
-"^@	c #FCE636",
-"/@	c #F8BC45",
-"(@	c #E7833C",
-"_@	c #BB401D",
-":@	c #5C091A",
-"<@	c #E92B6C",
-"[@	c #F13FA8",
-"}@	c #FC34D7",
-"|@	c #F427F9",
-"1@	c #D131FE",
-"2@	c #AC3EFE",
-"3@	c #864BFF",
-"4@	c #5A50E8",
-"5@	c #2D4696",
-"6@	c #22588E",
-"7@	c #1B7495",
-"8@	c #1DD7E7",
-"9@	c #19FEE3",
-"0@	c #18FEAE",
-"a@	c #17FE78",
-"b@	c #15FE42",
-"c@	c #1BFB19",
-"d@	c #21AF0D",
-"e@	c #2A8D0A",
-"f@	c #388D09",
-"g@	c #67C60D",
-"h@	c #9EFF10",
-"i@	c #B8FE0F",
-"j@	c #D3FE0E",
-"k@	c #EEFD0E",
-"l@	c #FCE318",
-"m@	c #F5B027",
-"n@	c #E56D19",
-"o@	c #7C2304",
-"p@	c #1C0006",
-"q@	c #BD084A",
-"r@	c #F02099",
-"s@	c #FD1AD4",
-"t@	c #F20CF9",
-"u@	c #CC18FE",
-"v@	c #A327FE",
-"w@	c #7836FE",
-"x@	c #4D44F5",
-"y@	c #2949B4",
-"z@	c #195998",
-"A@	c #1288B4",
-"B@	c #0BE0F4",
-"C@	c #04FEE1",
-"D@	c #03FFA9",
-"E@	c #03FF6E",
-"F@	c #03FE34",
-"G@	c #0AFE08",
-"H@	c #1BCF01",
-"I@	c #279B01",
-"J@	c #3BA101",
-"K@	c #6DE102",
-"L@	c #98FF02",
-"M@	c #B4FD02",
-"N@	c #D1FE02",
-"O@	c #EFFE02",
-"P@	c #FEE50E",
-"Q@	c #EAA419",
-"R@	c #944609",
-"S@	c #1B0700",
-"T@	c #2D0012",
-"U@	c #9B0E63",
-"V@	c #E810C1",
-"W@	c #F206F8",
-"X@	c #CE14FF",
-"Y@	c #A324FF",
-"Z@	c #7734FF",
-"`@	c #4E45FF",
-" #	c #3765F8",
-".#	c #2689EC",
-"+#	c #19BBF9",
-"@#	c #09E9FD",
-"##	c #00E5CA",
-"$#	c #02C381",
-"%#	c #02BF52",
-"&#	c #00DD29",
-"*#	c #08FB06",
-"=#	c #24FD02",
-"-#	c #3CF002",
-";#	c #59F302",
-">#	c #7BFE02",
-",#	c #9AFF02",
-"'#	c #B7FF02",
-")#	c #CDFA00",
-"!#	c #D4E200",
-"~#	c #B0A00C",
-"{#	c #614C1A",
-"]#	c #0F0A06",
-"^#	c #161117",
-"/#	c #6A3C67",
-"(#	c #88208E",
-"_#	c #8C13AF",
-":#	c #801CCB",
-"<#	c #652ADE",
-"[#	c #443CE7",
-"}#	c #315EEA",
-"|#	c #2284E6",
-"1#	c #139CD2",
-"2#	c #128E9D",
-"3#	c #4A7E7C",
-"4#	c #869796",
-"5#	c #8B9A98",
-"6#	c #52785B",
-"7#	c #1B891A",
-"8#	c #1CBD03",
-"9#	c #34D300",
-"0#	c #4CD400",
-"a#	c #60CA00",
-"b#	c #6EB804",
-"c#	c #749E10",
-"d#	c #73862A",
-"e#	c #797F57",
-"f#	c #7D807B",
-"g#	c #494D52",
-"h#	c #7B8487",
-"i#	c #BFCACB",
-"j#	c #9FA4AA",
-"k#	c #858294",
-"l#	c #706C89",
-"m#	c #606285",
-"n#	c #586584",
-"o#	c #5C7185",
-"p#	c #73858E",
-"q#	c #A7AEB2",
-"r#	c #DAE0E5",
-"s#	c #E5EDF2",
-"t#	c #DBE3E8",
-"u#	c #BABDC2",
-"v#	c #B1B5BB",
-"w#	c #8D9B95",
-"x#	c #798E7B",
-"y#	c #7A8D79",
-"z#	c #859385",
-"A#	c #97A09D",
-"B#	c #B0B6BC",
-"C#	c #CAD1DA",
-"D#	c #C7CED4",
-"E#	c #9A9EA1",
-"F#	c #242629",
-"G#	c #2A2D31",
-"H#	c #BFC7CC",
-"I#	c #E6F0F5",
-"J#	c #E3EDF1",
-"K#	c #E1EBEE",
-"L#	c #DFE8EB",
-"M#	c #DEE6E9",
-"N#	c #E0E8EC",
-"O#	c #E3EBF0",
-"P#	c #E3ECF2",
-"Q#	c #E1EAEF",
-"R#	c #E0E9EE",
-"S#	c #D6DEE3",
-"T#	c #D8E0E4",
-"U#	c #E2EBF0",
-"V#	c #E4EDF2",
-"W#	c #E3EBF2",
-"X#	c #E4ECF2",
-"Y#	c #E4EDF3",
-"Z#	c #E3ECF1",
-"`#	c #CED5D9",
-" $	c #ADB1B3",
-".$	c #53565A",
-"+$	c #505559",
-"@$	c #D1DADF",
-"#$	c #E1E9EE",
-"$$	c #DEE7EC",
-"%$	c #C6CDD0",
-"&$	c #AFB3B5",
-"*$	c #73777A",
-"=$	c #62666B",
-"-$	c #D3DBE0",
-";$	c #E4ECF1",
-">$	c #E2EAEF",
-",$	c #D8DFE3",
-"'$	c #C5CBCE",
-")$	c #BDC2C5",
-"!$	c #BCC1C4",
-"~$	c #C1C6C9",
-"{$	c #D1D8DC",
-"]$	c #E0E8ED",
-"^$	c #C5CACD",
-"/$	c #AEB1B3",
-"($	c #7D8083",
-"_$	c #565B5F",
-":$	c #C4CBD1",
-"<$	c #E2EBEF",
-"[$	c #CFD5D9",
-"}$	c #CDD3D6",
-"|$	c #D5DCE0",
-"1$	c #DFE6EB",
-"2$	c #DEE6EB",
-"3$	c #C6CBCF",
-"4$	c #AAADAF",
-"5$	c #727578",
-"6$	c #33363A",
-"7$	c #D5DDE2",
-"8$	c #E1E8ED",
-"9$	c #D6DDE1",
-"0$	c #BBC0C3",
-"a$	c #939698",
-"b$	c #4F5255",
-"c$	c #42464A",
-"d$	c #898F94",
-"e$	c #BFC6CB",
-"f$	c #DCE4E8",
-"g$	c #DDE4E9",
-"h$	c #DAE2E6",
-"i$	c #D4DBDF",
-"j$	c #C7CDD0",
-"k$	c #AEB3B6",
-"l$	c #888C8E",
-"m$	c #55575A",
-"n$	c #414447",
-"o$	c #575A5E",
-"p$	c #626569",
-"q$	c #626568",
-"r$	c #575A5D",
-"s$	c #434548",
-"t$	c #292B2D",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                            . + @ #                             ",
-"                      $ % & * = - ; > , ' )                     ",
-"                  ! ~ { ] ^ / ( ( / _ ] ( : < [                 ",
-"              } | 1 2 3 3 3 3 3 3 3 3 3 3 4 2 5 6               ",
-"            7 8 9 0 a a a a a a a a a a a a a b c d             ",
-"          e f g h h h h h h h h h h h h h h h h i j k           ",
-"          l m n o p q r n s t u v w x y z o A o o o B C         ",
-"        D E F G H I J K L M N O P Q R S T U V W X Y Z `         ",
-"       ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.      ",
-"    [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.  ",
-"  q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.  ",
-"  U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+",
-"  :+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+",
-"  q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+",
-"  V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@  ",
-"  :@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@  ",
-"  p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@  ",
-"    T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#    ",
-"      ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#      ",
-"        h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#      ",
-"        G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#W#X#Y#Z#`# $.$        ",
-"          +$@$O##$Q#Q#Q#Q##$R##$Q#Q#R##$Q##$Q#$$%$&$*$          ",
-"            =$-$;$Q##$Q#>$,$'$)$!$~${$#$>$>$]$^$/$($            ",
-"              _$:$;$<$#$>$]$T#[$}$|$1$>$>$2$3$4$5$              ",
-"                6$J 7$;$;$>$U#O#O#O#O#8$9$0$a$b$                ",
-"                    c$d$e$S#f$g$h$i$j$k$l$m$                    ",
-"                          n$o$p$q$r$s$t$                        ",
-"                                                                ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules
index 4f8a32879..a40072965 100755
--- a/ubuntu/_base/applications/graphics/gwenview/debian/rules
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/rules
@@ -1,44 +1,18 @@
-#! /usr/bin/make -f
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
+#!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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-kipi --enable-final --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-DEB_INSTALL_DOCS_ALL :=
-DEB_INSTALL_CHANGELOGS_ALL := NEWS
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/gwenview-trinity::
-	install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm
-	install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-	
-	cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \
-	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
+-include /usr/share/cdbs/1/class/tde.mk
+
+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"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian b/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
deleted file mode 100644
index 5e7bd078a..000000000
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
+++ /dev/null
@@ -1,10 +0,0 @@
-This program was initialy writen for Trinity. To compile it for KDE4 the
-exif support is disabled. That library depends on tdelibs3.
-
-MT is enabled because configure seems not smart enough.
-
-Qt version coded in configure.in.in
-Hard-coded dependency on libtdeio.la (in tdelibs4-dev)
-Hard-coded dependency on dcopidl
-
- -- Paul Gevers <paul@climbing.nl>  Sun, 14 Sep 2008 10:17:50 -0500
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
index a4c43964e..82123634e 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/control
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
@@ -3,14 +3,9 @@ Section: graphics
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
-Build-Depends: debhelper (>= 9~),
-               cdbs, quilt,
-               libksquirrel-trinity-dev,
-               libkonq4-trinity-dev,
-               kipi-plugins-trinity,
-               libkipi0-trinity-dev,
-               build-essential,
-               automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ libksquirrel-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev,
+ tdebase-trinity-dev, libkonq4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: ksquirrel-trinity
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/docs b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
index 724e08449..6f12db508 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
@@ -1,2 +1,2 @@
+AUTHORS
 README
-TODO
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
deleted file mode 100644
index a6da62b4c..000000000
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" 
-.TH "KSQUIRREL-LIBS-CONFIGURATOR" "1" "september 13, 2008" "Paul Gevers" "Graphics"
-.SH "NAME"
-ksquirrel\-libs\-configurator \- library configurator for ksquirel
-.SH "SYNOPSIS"
-.B ksquirrel\-libs\-configurator
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B ksquirrel\-libs\-configurator
-and
-.B ksquirrel\-libs\-configurator\-real
-commands.
-\fBksquirrel\-libs\-configurator\fP is a graphical user interface that lets you select which libraries should be enabled/disabled in ksquirrel.
-.SH "OPTIONS"
-These programs does not have any options.
-.SH "SEE ALSO"
-ksquirrel(1)
-.SH "AUTHORS"
-ksquirrel\-libs\-configurator was written by <Baryshev Dmitry>.
-.PP 
-This manual page was written by Paul Gevers <paul@climbing.nl>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
index 813fff66f..d8f798f1c 100755
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
@@ -1,128 +1,16 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-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)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-config.status: configure
-	dh_testdir
-
-configure:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub admin/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess admin/config.guess
-endif
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-	# Add here commands to configure the package.
-	PKG_CONFIG_PATH='/opt/trinity/lib/pkgconfig' kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
-# Tricks for Intrepid
-#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/ksquirrel.sgml > ksquirrel.1
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/ksquirrel-trinity.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/ksquirrel-trinity install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_install
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman debian/ksquirrel-libs-configurator.1
-	cp -a debian/ksquirrel-trinity/usr/share/man debian/ksquirrel-trinity/opt/trinity/share/
-	rm -fr debian/ksquirrel-trinity/usr/share/man
-	dh_link \
-	opt/trinity/share/man/man1/ksquirrel-libs-configurator.1 \
-	opt/trinity/share/man/man1/ksquirrel-libs-configurator-real.1
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/graphics/ksquirrel/debian/watch b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
deleted file mode 100644
index a276799ff..000000000
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-http://sf.net/ksquirrel/ksquirrel-([\d.]*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/compat
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control
index abf8f7a57..ab610adb2 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/control
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net>
 Uploaders: Bartosz Fenski <fenio@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: potracegui-trinity
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/rules b/ubuntu/_base/applications/graphics/potracegui/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/graphics/potracegui/debian/rules
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/compat b/ubuntu/_base/applications/internet/kasablanca/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/compat
+++ b/ubuntu/_base/applications/internet/kasablanca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/control b/ubuntu/_base/applications/internet/kasablanca/debian/control
index 5e701cb6c..63dddef22 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/control
+++ b/ubuntu/_base/applications/internet/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libssl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: kasablanca-trinity
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/rules b/ubuntu/_base/applications/internet/kasablanca/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/internet/kasablanca/debian/rules
+++ b/ubuntu/_base/applications/internet/kasablanca/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/compat b/ubuntu/_base/applications/internet/kbiff/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/compat
+++ b/ubuntu/_base/applications/internet/kbiff/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control
index 273bec840..4c323e2c4 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/control
+++ b/ubuntu/_base/applications/internet/kbiff/debian/control
@@ -2,7 +2,7 @@ Source: kbiff-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
 Standards-Version: 3.9.1
 
 Package: kbiff-trinity
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/rules b/ubuntu/_base/applications/internet/kbiff/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/kbiff/debian/rules
+++ b/ubuntu/_base/applications/internet/kbiff/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/compat b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/control b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
index 832139e15..0f7542f19 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/control
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libssl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kftp.org
 
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/knmap/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/knmap/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/knmap/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/knmap/debian/compat b/ubuntu/_base/applications/internet/knmap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/compat
+++ b/ubuntu/_base/applications/internet/knmap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/knmap/debian/control b/ubuntu/_base/applications/internet/knmap/debian/control
index 7d46e8cd9..248c8bd34 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/control
+++ b/ubuntu/_base/applications/internet/knmap/debian/control
@@ -2,7 +2,7 @@ Source: knmap-trinity
 Section: tde
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.2
 
 Package: knmap-trinity
diff --git a/ubuntu/_base/applications/internet/knmap/debian/rules b/ubuntu/_base/applications/internet/knmap/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/knmap/debian/rules
+++ b/ubuntu/_base/applications/internet/knmap/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/konversation/debian/compat b/ubuntu/_base/applications/internet/konversation/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/compat
+++ b/ubuntu/_base/applications/internet/konversation/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control
index 4795202fb..23bbc606d 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/control
+++ b/ubuntu/_base/applications/internet/konversation/debian/control
@@ -4,17 +4,17 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev, dh-python
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Homepage: http://konversation.kde.org/
 
 Package: konversation-trinity
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}
 Replaces: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~)
 Breaks: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~)
-Recommends: python-all, ruby
+Recommends: python3-all, ruby
 Suggests: libsoap-lite-perl
 Description: user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
  Konversation is a client for the Internet Relay Chat (IRC) protocol.
diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
index e7f450c0c..0b6e0f321 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
@@ -1,2 +1,2 @@
-TODO
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
index c62ad7db5..15ccbbe5e 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
@@ -6,16 +6,10 @@ debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
 debian/tmp/opt/trinity/share/apps/konversation/scripts/*
 debian/tmp/opt/trinity/share/apps/konversation/themes/*
 debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/*
-#debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/ru/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/sv/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/*
 debian/tmp/opt/trinity/share/icons/*
 debian/tmp/opt/trinity/share/locale/*
+debian/tmp/opt/trinity/share/man/man1/*
 debian/tmp/opt/trinity/share/services/konvirc.protocol
 debian/tmp/opt/trinity/share/services/konvirc6.protocol
 
diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
deleted file mode 100644
index 8b3496a3d..000000000
--- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-#debian/man/*.1
diff --git a/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
deleted file mode 100644
index 719d6e158..000000000
--- a/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Nathaniel</firstname>
-      <othername role="mi">W</othername>
-      <surname>Turner</surname>
-      <email>nate@houseofnate.net</email>
-    </author>
-    <copyright>
-      <year>2004</year>
-      <holder>Nathaniel W. Turner</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2005-05-31</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>KONVERSATION</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>konversation</refname>
-    <refpurpose>user friendly IRC client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>konversation</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      Konversation is client for the Internet Relay Chat (IRC) protocol.
-    </para>
-    <para>
-      IRC is a great way to meet friends on the net, make new acquaintances and
-      lose yourself in talk about your favorite subject.
-    </para>
-    <para>
-      Konversation is under active development and is currently in beta.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      <variablelist>
-        <title>Options</title>
-        <varlistentry>
-          <term><option>--server</option>
-            <arg choice="req"><replaceable>server</replaceable></arg></term>
-          <listitem><para>Server to connect</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--port</option>
-            <arg choice="req"><replaceable>port</replaceable></arg></term>
-          <listitem><para>Port to use (default: 6667)</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--channel</option>
-            <arg choice="req"><replaceable>channel</replaceable></arg></term>
-          <listitem><para>Channel to join after connection</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--nick</option>
-            <arg choice="req"><replaceable>nickname</replaceable></arg></term>
-          <listitem><para>Nickname to use</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--password</option>
-            <arg choice="req"><replaceable>password</replaceable></arg></term>
-          <listitem><para>Password for connection</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--ssl</option></term>
-          <listitem><para>Use SSL for connection (default:
-              false)</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-    <!-- TODO * add all the rest of the options, but maybe find an automated
-    way to keep it up to date -->
-  </refsect1>
-  <refsect1>
-    <title>SCRIPTING</title>
-    <para>Konversation looks for scripts in <filename
-        class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
-      in <filename
-        class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
-      To execute a script, use the <command>exec</command> command:</para>
-    <cmdsynopsis>
-      <command>/exec</command> 
-      <arg choice="req"><replaceable>scriptname</replaceable></arg>
-      <arg choice="opt"><replaceable>arguments</replaceable></arg>
-    </cmdsynopsis>
-    <para>
-      For example:
-    </para>
-    <para><userinput>/exec gauge 75</userinput></para>
-  </refsect1>
-  <refsect1>
-    <title>FILES</title>
-    <para>
-      <variablelist>
-        <varlistentry>
-          <term><filename>~/.trinity/share/config/konversationrc</filename></term>
-          <listitem><para>Main configuration</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <filename>~/.trinity/share/config/konversation.eventsrc</filename>
-          </term>
-          <listitem><para>Notification settings</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <filename
-              class="directory">~/.trinity/share/apps/konversation/logs</filename>
-          </term>
-          <listitem><para>Directory containing channel log
-              files</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      The Konversation Handbook is an excellent resource for further reading.
-      It can be found under the <guimenu>Help</guimenu> menu in Konversation.
-    </para>
-    <para>
-      The following manual pages may also be of interest:
-      <citerefentry>
-        <refentrytitle>konversationircprotocolhandler</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>dcop</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Nathaniel W. Turner
-      <email>nate@houseofnate.net</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
deleted file mode 100644
index 3a82060c1..000000000
--- a/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Nathaniel</firstname>
-      <othername role="mi">W</othername>
-      <surname>Turner</surname>
-      <email>nate@houseofnate.net</email>
-    </author>
-    <copyright>
-      <year>2004</year>
-      <holder>Nathaniel W. Turner</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2004-07-06</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>KONVERSATIONIRCPROTOCOLHANDLER</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>konversationircprotocolhandler</refname>
-    <refpurpose>handler for irc:// URI scheme</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>konversationircprotocolhandler</command>
-      <arg choice="req">
-        <option>URI</option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      This program takes a URI of the form
-      irc://<replaceable>server</replaceable>:<replaceable>port</replaceable>/
-      (or simply irc://<replaceable>server</replaceable>/) and opens a
-      connection to the specified IRC server in a running Konversation client.
-    </para>
-    <para>
-      This program is registered with TDE as a handler for the irc URI scheme,
-      and TDE applications will use this program to handle such URI.
-      (For example, it will be called if a user clicks on an irc:// link on a
-      web page in Konqueror.)
-    </para>
-    <para>
-      This program can also be used directly, but since it is somewhat internal
-      to Konversation, it's interface might change in an incompatible way, and
-      relying on it is not advised. It is better to use Konversation's dcop
-      interface directly.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>BUGS</title>
-    <para>
-      This program will only work if there is a currently running konversation
-      process.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>konversation</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>dcop</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Nathaniel W. Turner
-      <email>nate@houseofnate.net</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/internet/konversation/debian/rules b/ubuntu/_base/applications/internet/konversation/debian/rules
index 61fe9b5c9..400973b48 100755
--- a/ubuntu/_base/applications/internet/konversation/debian/rules
+++ b/ubuntu/_base/applications/internet/konversation/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg
 DEB_INSTALL_DOCS_ALL = 
@@ -18,22 +17,10 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON"
 
-### Manpages
-XP = xsltproc --nonet --output debian/man/
-DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
-
-%.1 : %.1.docbook
-	$(XP) $(DB2MAN) $<
-
-GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation-trinity:: $(GENERATED_MANPAGES)
-clean::
-	-rm -f $(GENERATED_MANPAGES)
-	-rm -f po/*/konversation.gmo
+binary-install/konversation-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/konversation/scripts
 
 ### Extra file installation
 install/konversation-trinity::
 	install -D -m 644 konversation/scripts/README \
 	  debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
-	dh_installman debian/man/*.1
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/compat b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/compat
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/control b/ubuntu/_base/applications/internet/kopete-otr/debian/control
index acc314c08..c3911aa4e 100644
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/control
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
 Standards-Version: 3.8.4
 
 Package: kopete-otr-trinity
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/docs b/ubuntu/_base/applications/internet/kopete-otr/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/rules b/ubuntu/_base/applications/internet/kopete-otr/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/rules
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/compat b/ubuntu/_base/applications/internet/kshowmail/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/compat
+++ b/ubuntu/_base/applications/internet/kshowmail/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/control b/ubuntu/_base/applications/internet/kshowmail/debian/control
index 16085c4cb..f47ba6fe4 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/control
+++ b/ubuntu/_base/applications/internet/kshowmail/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Lionel Le Folgoc <mrpouit@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev
 Standards-Version: 3.7.2
 
 Package: kshowmail-trinity
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/rules b/ubuntu/_base/applications/internet/kshowmail/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/internet/kshowmail/debian/rules
+++ b/ubuntu/_base/applications/internet/kshowmail/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/compat
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control
index cd91c065f..7bac440dc 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/control
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
 Section: sound 
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kstreamripper-trinity
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
deleted file mode 100644
index a59ccc8af..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/pixmaps
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
deleted file mode 100644
index f5542ab64..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
-    if [ -x /usr/bin/update-desktop-database ] ; then
-        /usr/bin/update-desktop-database -q 
-    fi
-fi
-
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
deleted file mode 100644
index 5209bcb38..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
-       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-          if [ -x "`which update-desktop-database 2>/dev/null`" ]; then 
-              update-desktop-database -q
-          fi
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
deleted file mode 100644
index 3129be689..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH "KSTREAMRIPPER" "1" "Apr 26, 2004" "Michael Ablassmeier" "sound"
-.SH "NAME"
-kstreamripper \- TDE frontend for streamripper
-.SH "SYNOPSIS"
-.B kstreamripper [Qt\-options] [TDE\-options]
-.SH "DESCRIPTION"
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-.SH "OPTIONS"
-.IP "\fB\-\-help\fR" 
-Show help about options
-.IP "\fB\-\-help\-qt\fR" 
-Show Qt specific options
-.IP "\fB\-\-help\-tde\fR" 
-Show TDE specific options
-.IP "\fB\-\-help\-all\fR" 
-Show all options
-.IP "\fB\-\-author\fR"
-Show author information
-.IP "\fB\-v, \-\-version\fR"
-Show version information
-.IP "\fB\-\-license\fR"
-Show license information
-.IP "\fB\-\-\fR"
-End of options
-.SH "SEE ALSO"
-streamripper(1)
-.SH "AUTHOR"
-2004 \- Created by Michael Ablassmeier (abi@grinser.de) for the Debian Project.
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/rules b/ubuntu/_base/applications/internet/kstreamripper/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/rules
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/compat b/ubuntu/_base/applications/internet/ktorrent/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/compat
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
index 65092ce74..c7686b835 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/control
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
deleted file mode 100644
index 63a5fa185..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>tonio@ubuntu.com</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-12-205</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>ktorrent</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>ktorrent</refname>
-    <refpurpose>BitTorrent client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>ktorrent</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      BitTorrent client for TDE.
-    </para>
-    <para>
-      KTorrent is a BitTorrent program for TDE. Its features include speed capping (both down and up), integrated searching, UDP tracker support, preview of certain file types (video and audio) and integration into the TDE Panel enabling background downloading.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. ktorrent has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to ktorrent it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>tonio@ubuntu.com</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules
index a90794996..a40072965 100755
--- a/ubuntu/_base/applications/internet/ktorrent/debian/rules
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/rules
@@ -1,21 +1,18 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/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
+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"
 
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-build/ktorrent-trinity::
-	docbook2x-man debian/ktorrent.1.docbook
-
-clean::
-	rm -f ktorrent.1
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/watch b/ubuntu/_base/applications/internet/ktorrent/debian/watch
deleted file mode 100644
index 0262eb3c5..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://ktorrent.org/downloads/(^2\.[\d\.]+)/ktorrent-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/compat
+++ b/ubuntu/_base/applications/internet/kvirc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control
index 528f85fdc..f1c0488bd 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/control
+++ b/ubuntu/_base/applications/internet/kvirc/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, libssl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kvirc.net/
 
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index 6ba0b5d33..010c6f400 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/bin/kvi_run_netscape
 debian/tmp/opt/trinity/bin/kvi_search_help
 debian/tmp/opt/trinity/share/applnk/Internet/kvirc.desktop
+debian/tmp/opt/trinity/share/apps/tdeconf_update/
 debian/tmp/opt/trinity/share/icons/hicolor/
 debian/tmp/opt/trinity/share/kvirc/*/config/
 debian/tmp/opt/trinity/share/kvirc/*/defscript/
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules
index 6fc9dffe2..6ca089653 100755
--- a/ubuntu/_base/applications/internet/kvirc/debian/rules
+++ b/ubuntu/_base/applications/internet/kvirc/debian/rules
@@ -47,7 +47,7 @@ endif
 	#
 	#   Don't compress these files
 	#
-DEB_COMPRESS_EXCLUDE := .kvs
+DEB_COMPRESS_EXCLUDE_ALL += .kvs
 
 # The default gzip compressor has been changed in dpkg >= 1.17.0.
 deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/compat b/ubuntu/_base/applications/internet/kvpnc/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/compat
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/control b/ubuntu/_base/applications/internet/kvpnc/debian/control
index 18ca8c728..cbf7efe69 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/control
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
 Standards-Version: 3.8.4
 
 Package: kvpnc-trinity
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 0729793b7..0f1ba7bcb 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -5,7 +5,7 @@ index 7c45fcf..b933832 100644
 @@ -24,6 +24,7 @@
  #include <tdemessagebox.h>
  #include <tdemainwindow.h>
- #include <kapp.h>
+ #include <tdeapplication.h>
 +#include <kuser.h>
  
  #include <tdelocale.h>
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/rules b/ubuntu/_base/applications/internet/kvpnc/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/kvpnc/debian/rules
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/smb4k/debian/compat
+++ b/ubuntu/_base/applications/internet/smb4k/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control
index 4f01f0481..7280860cc 100644
--- a/ubuntu/_base/applications/internet/smb4k/debian/control
+++ b/ubuntu/_base/applications/internet/smb4k/debian/control
@@ -2,7 +2,7 @@ Source: smb4k-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: tdebase-trinity-dev, tdelibs14-trinity-dev, libart-2.0-dev, libpng-dev, zlib1g-dev, debhelper (>= 9~), cdbs, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://smb4k.berlios.de/
 
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series b/ubuntu/_base/applications/internet/smb4k/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
+++ b/ubuntu/_base/applications/internet/smb4k/debian/patches/series
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules
index 95e8cd9f1..d8f798f1c 100755
--- a/ubuntu/_base/applications/internet/smb4k/debian/rules
+++ b/ubuntu/_base/applications/internet/smb4k/debian/rules
@@ -1,33 +1,16 @@
 #!/usr/bin/make -f
-# 
-# Uhm, too much complicated eh?
-#
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/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
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
+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/applications/internet/smb4k/debian/watch b/ubuntu/_base/applications/internet/smb4k/debian/watch
deleted file mode 100644
index 70154d877..000000000
--- a/ubuntu/_base/applications/internet/smb4k/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-version=3
-opts=downloadurlmangle=s/prdownload/download/ \
-  http://developer.berlios.de/project/showfiles.php?group_id=769 \
-  http://prdownload.berlios.de/smb4k/smb4k-([\d\.]+)\.tar\.bz2 
-
-
diff --git a/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/internet/tork/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/tork/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/internet/tork/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/internet/tork/debian/compat b/ubuntu/_base/applications/internet/tork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/tork/debian/compat
+++ b/ubuntu/_base/applications/internet/tork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/tork/debian/control b/ubuntu/_base/applications/internet/tork/debian/control
index 8acf55f64..c1974395f 100644
--- a/ubuntu/_base/applications/internet/tork/debian/control
+++ b/ubuntu/_base/applications/internet/tork/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Homepage: http://tork.sourceforge.net/
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev
 Standards-Version: 3.9.1
 
 Package: tork-trinity
diff --git a/ubuntu/_base/applications/internet/tork/debian/docs b/ubuntu/_base/applications/internet/tork/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/tork/debian/docs
+++ b/ubuntu/_base/applications/internet/tork/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/internet/tork/debian/rules b/ubuntu/_base/applications/internet/tork/debian/rules
index e144721b9..9c1db7c8c 100755
--- a/ubuntu/_base/applications/internet/tork/debian/rules
+++ b/ubuntu/_base/applications/internet/tork/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/compat b/ubuntu/_base/applications/misc/bibletime/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/compat
+++ b/ubuntu/_base/applications/misc/bibletime/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control
index e68bb12de..cd32d71e9 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/control
+++ b/ubuntu/_base/applications/misc/bibletime/debian/control
@@ -1,6 +1,6 @@
 Source: bibletime-trinity
 Section: tde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Standards-Version: 3.8.4
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
deleted file mode 100644
index a7b223af3..000000000
--- a/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Software für das Bibelstudium für TDE
-.SH "ÃœBERSICHT"
-.B bibletime
-[
-\fIQt\-Optionen\fR
-] 
-[
-\fITDE\-Optionen\fR
-]
-[
-\fIOptionen\fR
-]
-.SH "BESCHREIBUNG"
-Diese Manpage beschreibt die 
-TDE\-Applikation
-.B bibletime
-und wurde für Debian GNU/Linux geschrieben, weil
-das Programm selbst keine Manpage mitbrachte.
-.P
-.B BibleTime
-ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium
-für UNIX\-Systeme.
-Es erfordert eine laufende TDE\-Umgebung und die Bibliothek SWORD.
-BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln, 
-Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen
-Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern,
-drucken usw.).
-.SS "Einfache Optionen:"
-.TP 
-\fB\-\-help\fR
-Optionen von "Hilfe zu" anzeigen
-.TP 
-\fB\-\-help\-qt\fR
-Spezielle Optionen zu Qt anzeigen
-.TP 
-\fB\-\-help\-tde\fR
-Spezielle Optionen zu TDE anzeigen
-.TP 
-\fB\-\-help\-all\fR
-Alle Optionen anzeigen
-.TP 
-\fB\-\-author\fR
-Autoren\-Information anzeigen
-.TP 
-\fB\-v\fR, \fB\-\-version\fR
-Versionsinformation anzeigen
-.TP 
-\fB\-\-license\fR
-Lizenz\-Info anzeigen
-.TP 
-\fB\-\-\fR
-Ende der Optionen
-.SH "OPTIONEN"
-.TP 
-\fB\-\-debug\fR
-Fehlermeldungen aktivieren
-.TP 
-\fB\-\-ignore\-session\fR
-Die Startsitzung ignorieren, die beim letzten Beenden von BibleTime
-gespeichert wurde.
-.TP 
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Die Standardbibel an der angegebenen Stelle \fIkey\fR öffnen.
-Verwenden Sie \fIrandom\fR, um eine zufällige Stelle aufzuschlagen.
-.SH "SIEHE AUCH"
-Die vollständige Dokumentation für
-.B bibletime
-und das
-.B Bibelstudium
-werden als DocBook\-Handbuch bereitgestellt. Wenn das Progamm
-.B khelpcenter
-richtig eingerichtet ist, sollte das Kommando
-.IP 
-.B khelpcenter help:/bibletime
-.PP 
-das komplette Handbuch zugänglich machen.
-.SH "FEHLER"
-Bitte melden Sie Fehler an 
-.br 
-http://bugs.trinitydesktop.org oder info@bibletime.info ,
-.br 
-nicht direkt an die Autoren.
-.br 
-.SH "AUTOREN"
-BibleTime wurde geschrieben von:
-.br 
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br 
-Martin Gruner <mg.pub@gmx.net>
-.br 
-Nikolay Igotti <olonho@hotmail.com>
-.br 
-Gary Sims <gary@garysims.co.uk>
-.br 
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br 
-James Ots <me@jamesots.com>
-.br 
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P 
-Diese Manpage wurde erstellt von
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-für Debian GNU/Linux (kann aber auch von anderen genutzt werden).
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/docs b/ubuntu/_base/applications/misc/bibletime/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/misc/bibletime/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
deleted file mode 100644
index 46332c7d9..000000000
--- a/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Bible study tool for TDE
-.SH "SYNOPSIS"
-.B bibletime
-[
-\fIQt\-options\fR
-] 
-[
-\fITDE\-options\fR
-]
-[
-\fIoptions\fR
-]
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B bibletime
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B BibleTime
-is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
-.SS "Generic options:"
-.TP 
-\fB\-\-help\fR
-Show help about options
-.TP 
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP 
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP 
-\fB\-\-help\-all\fR
-Show all options
-.TP 
-\fB\-\-author\fR
-Show author information
-.TP 
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP 
-\fB\-\-license\fR
-Show license information
-.TP 
-\fB\-\-\fR
-End of options.
-.SH "OPTIONS"
-.TP 
-\fB\-\-debug\fR
-Enable debug messages.
-.TP 
-\fB\-\-ignore\-session\fR
-Ignore the startup session that was saved when BibleTime was closed
-the last time.
-.TP 
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Open the default bible with the given \fIkey\fR.
-Use 
-.I random
-to open at a random position.
-.SH "SEE ALSO"
-The full documentations for
-.B bibletime
-and 
-.B bible study
-are maintained as docbook manuals. If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP 
-.B khelpcenter help:/bibletime
-.PP 
-should give you access to the complete manual.
-.SH "BUGS"
-Please use 
-.br 
-http://bugs.trinitydesktop.org or info@bibletime.info 
-.br 
-to report bugs, do not mail the authors directly.
-.br 
-.SH "AUTHOR"
-BibleTime was written by
-.br 
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br 
-Martin Gruner <mg.pub@gmx.net>
-.br 
-Nikolay Igotti <olonho@hotmail.com>
-.br 
-Gary Sims <gary@garysims.co.uk>
-.br 
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br 
-James Ots <me@jamesots.com>
-.br 
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P 
-This manual page was prepared by
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/install b/ubuntu/_base/applications/misc/bibletime/debian/install
index dc727ccec..dcf290ae2 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/install
+++ b/ubuntu/_base/applications/misc/bibletime/debian/install
@@ -1,3 +1 @@
-bibletime.xpm /opt/trinity/share/pixmaps/
-en/bibletime.1 /opt/trinity/share/man/man1
-de/bibletime.1 /opt/trinity/share/man/de/man1
+debian/bibletime.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules
index 430b47715..d8f798f1c 100755
--- a/ubuntu/_base/applications/misc/bibletime/debian/rules
+++ b/ubuntu/_base/applications/misc/bibletime/debian/rules
@@ -1,23 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
-DEB_DH_INSTALL_SOURCEDIR := debian
-
-DEB_BUILDDIR = $(DEB_SRCDIR)
-
-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
-DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true
-
-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
-
-binary-install/bibletime-trinity::
-	chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/*
-	chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc
-	chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips
+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/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
index 2fb9394d3..303fbd42d 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
 Section: libs
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
 Standards-Version: 3.8.4
 
 Package: compizconfig-backend-tdeconfig-trinity
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
+++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
index 4c731ebe2..106202353 100644
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
+++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
@@ -2,16 +2,16 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev
+Build-Depends-Indep: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev,
+ dh-python, python3-all-dev, pytde-dev
 Standards-Version: 3.8.4
-XS-Python-Version: all
+X-Python3-Version: all
 
 Package: desktop-effects-tde-trinity
 Architecture: all
-Depends: ${python:Depends}, python-tqt, python-trinity-trinity
+Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde
 Replaces: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~)
 Breaks: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~)
-XB-Python-Version: ${python:Versions}
 Description: compiz setup tool for Trinity
  A simple Compiz configuration tool for Trinity.  Installs and sets Compiz
  as the window manager.
diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
deleted file mode 100644
index 2b6b93781..000000000
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
+++ /dev/null
@@ -1,8 +0,0 @@
-desktop-effects-tde /opt/trinity/bin/
-25enable-compiz /etc/X11/Xsession.d/
-DesktopEffects/DesktopEffectsCommon.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsDialog.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsTDE.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/__init__.py /opt/trinity/share/pyshared/DesktopEffects/
-data/* /opt/trinity/share/apps/desktop-effects-tde/
-desktop-effects-tde.desktop /opt/trinity/share/applications/
diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules
index eef8add16..8542a64ba 100755
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules
+++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules
@@ -1,26 +1,19 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/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)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
+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"
 
 binary-install/desktop-effects-tde-trinity::
-	${DH_PYTHON2} -pdesktop-effects-tde-trinity
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/changelog b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
deleted file mode 100644
index 87f2b117a..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
+++ /dev/null
@@ -1,76 +0,0 @@
-fusion-icon-trinity (0.0.0+git20071028-0ubuntu1) jaunty; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 16 Apr 2009 19:57:00 -0600
-
-fusion-icon (0.0.0+git20071028-2ubuntu2) hardy; urgency=low
-
-  * Rebuild package so that it uses the python-central's new directories,
-    to avoid an installation error (LP: #207831).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Fri, 28 Mar 2008 00:22:47 +0100
-
-fusion-icon (0.0.0+git20071028-2ubuntu1) hardy; urgency=low
-
-  * Manual sync to workaround .orig.tar.gz mismatch (LP: #204799).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Fri, 21 Mar 2008 20:55:03 +0100
-
-fusion-icon (0.0.0+git20071028-2) unstable; urgency=medium
-
-  * debian/control:
-     - Bump python-central build dependency's minimum version to 0.6.0.
-     - Remove "${shlibs:Depends}" from Depends.
-  * debian/rules:
-     - Do not try to remove usr/lib, as python-central doesn't create it
-       anymore now (Closes: #472010).
-     - Remove unnecessary explicit dh_pycentral call.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Fri, 21 Mar 2008 19:57:39 +0100
-
-fusion-icon (0.0.0+git20071028-1) unstable; urgency=low
-
-  * Initial upload to Debian (Closes: #461769).
-  * debian/rules:
-     - Change priority from "extra" to "optional".
-     - Change the Maintainer to myself and add the python-apps team
-       as Uploader.
-     - Add SVN information.
-  * debian/copyright:
-     - Some formatting changes.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sun, 20 Jan 2008 21:34:55 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu2) hardy; urgency=low
-
-  * patches/remove_shabangs.patch:
-     - Remove Python shabangs
-  * patches/update-desktop-file.patch:
-     - Update .desktop file to match the current FD.o standards
-     - Add Catalan and Spanish translations
-     - Launch with the "--no-start" option, so that it doesn't reload
-       Compiz when it's run from the menu
-  * patches/glx_vendor_crash.patch:
-     - Always define the self.glx_vendor variable, to avoid and
-       AttributeError (LP: #175504)
-  * Add a .xpm version of the icon (debian/fusion-icon.xpm) and a
-    menu file (debian/menu, debian/install)
-  * Symlink the .png icon to /usr/share/pixmaps, so that it's
-    displayed in the menu and the tray (debian/links)
-  * Add a manpage (debian/fusion-icon.1, debian/manpages)
-  * debian/control:
-     - Bump standards version to 3.7.3
-     - Bump cdbs' and debhelper's minium versions.
-     - Move python-central and intltool to Build-Depends-Indep
-     - Add python-compizconfig dependency (LP: #174507)
-     - Add python-qt4 as alternative dependency to python-gtk2
-     - Change short description
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Tue, 11 Dec 2007 20:49:24 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu1) hardy; urgency=low
-
-  * Initial upload.
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Sun, 28 Oct 2007 11:28:19 -0400
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/compat b/ubuntu/_base/applications/misc/fusion-icon/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/control b/ubuntu/_base/applications/misc/fusion-icon/debian/control
deleted file mode 100644
index ee5531317..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: fusion-icon-trinity
-Section: x11
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
-XS-Python-Version: all
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 9~), quilt, pkg-config, python-all-dev
-Build-Depends-Indep: python-support (>= 0.6) | dh-python
-Standards-Version: 3.8.4
-
-Package: fusion-icon-trinity
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Replaces: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~)
-Breaks: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~)
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
-Description: tray icon to launch and manage Compiz Fusion [Trinity]
- The OpenCompositing Project brings 3D desktop visual effects that
- improve the usability and eye candy of the X Window System and provide
- increased productivity.
- .
- This package contains a tray icon that can launch Compiz and its
- decorators.
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/copyright b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
deleted file mode 100644
index ae1ce34fa..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
+++ /dev/null
@@ -1,31 +0,0 @@
-This package was debianized by Michael Vogt <mvo@ubuntu.com>
-Wed, 28 Oct 2007 15:59:31 +0200.
-
-It was downloaded from git://anongit.compiz-fusion.org/users/crdlb/fusion-icon
-
-Upstream Author:
-
-    Christopher Williams
-
-Copyright:
-
-    Copyright (C) 2007 Christopher Williams
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 2007 Michael Vogt <mvo@ubuntu.com>,
-(C) 2008 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>, and it
-is licensed under the GPL (see above).
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
deleted file mode 100644
index 1b15860e1..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.TH FUSION\-ICON "1" "11 December 2007"
-.SH NAME
-fusion\-icon \- tray icon to launch and manage Compiz Fusion
-.SH SYNOPSIS
-.B fusion\-icon\fR [\fBOPTIONS\fR]
-.SH DESCRIPTION
-.PP 
-This man page documents briefly the \fBfusion\-icon\fR command.
-\fBfusion\-icon\fR is a tray icon for easy window manager and window
-decorator switching, and it is being developed as part of the Open
-Compositing project.
-.SH OPTIONS
-.TP
-.B \-\-version
-Show \fBfusion\-icon\fR's version number and exit.
-.TP
-\fB\-s\fR <seconds>, \fB\-\-sleep\fR=<seconds>
-Sleep for \fIseconds\fR seconds before launching \fBfusion\-icon\fR.
-.TP
-\fB\-i\fR <interface>, \fB\-\-interface\fR=<interface>
-Try a certain interface first.
-.TP
-\fB\-u\fR, \fB\-\-no\-interface\fR
-Do not use any interface.
-.TP
-\fB\-f\fR, \fB\-\-force\-compiz\fR
-Start compiz regardless of environment or configuration.
-.TP
-\fB\-n\fR, \fB\-\-no\-start\fR
-Run, but do not start a window manager.
-
-.SH SEE ALSO
-.BR compiz (1)
-.PP
-
-.SH COPYRIGHT
-This manual page was written by Siegfried\-Angel Gevatter Pujals <rainct@ubuntu.com>.
-It is released under the GNU General Public License, version 2 or later.
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
deleted file mode 100644
index fe0843739..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
+++ /dev/null
@@ -1,359 +0,0 @@
-/* XPM */
-static char * fusion_icon_xpm[] = {
-"32 32 324 2",
-"  	c None",
-". 	c #C8E3FA",
-"+ 	c #D4E9FB",
-"@ 	c #FDFEFF",
-"# 	c #F0F5FB",
-"$ 	c #C6E2FA",
-"% 	c #CDE5FB",
-"& 	c #CBE6FB",
-"* 	c #C5E6FC",
-"= 	c #BEE7FB",
-"- 	c #B6E6FB",
-"; 	c #AAE3FB",
-"> 	c #9DDFFA",
-", 	c #93DCF9",
-"' 	c #E3F3FA",
-") 	c #E0EFF7",
-"! 	c #90BFE4",
-"~ 	c #77A8DF",
-"{ 	c #C3E0FA",
-"] 	c #C9E4FB",
-"^ 	c #C5E4FB",
-"/ 	c #C1E6FC",
-"( 	c #BAE6FB",
-"_ 	c #B3E5FB",
-": 	c #A7E2FB",
-"< 	c #9ADEFA",
-"[ 	c #8DDBF9",
-"} 	c #8CDBFB",
-"| 	c #A9D4E8",
-"1 	c #0681C1",
-"2 	c #017FBE",
-"3 	c #429ECF",
-"4 	c #82B7E0",
-"5 	c #6EA3DC",
-"6 	c #B9DCF9",
-"7 	c #ACE1FA",
-"8 	c #A1DEF9",
-"9 	c #93DAF7",
-"0 	c #87D6F7",
-"a 	c #87D7F8",
-"b 	c #9FCEE3",
-"c 	c #007DBD",
-"d 	c #007CBC",
-"e 	c #3C99CC",
-"f 	c #639FD9",
-"g 	c #B8DFF9",
-"h 	c #82D4F6",
-"i 	c #80D2F3",
-"j 	c #98CAE1",
-"k 	c #007CBB",
-"l 	c #007BBB",
-"m 	c #007BBA",
-"n 	c #5B9ED6",
-"o 	c #B7DDF9",
-"p 	c #7ECFF3",
-"q 	c #7EBBD6",
-"r 	c #89B8CC",
-"s 	c #7CCCEF",
-"t 	c #7DCFF3",
-"u 	c #91C5DE",
-"v 	c #007BB9",
-"w 	c #007AB9",
-"x 	c #5B9ED5",
-"y 	c #B6DEF7",
-"z 	c #77CBF0",
-"A 	c #79B9D4",
-"B 	c #ECF4FB",
-"C 	c #AEC6D2",
-"D 	c #77C1E0",
-"E 	c #8AC1DB",
-"F 	c #007AB8",
-"G 	c #0079B7",
-"H 	c #5B9DD5",
-"I 	c #B5DDF7",
-"J 	c #71C8EE",
-"K 	c #74B6D3",
-"L 	c #EEF6FD",
-"M 	c #EFF7FE",
-"N 	c #D7E3EB",
-"O 	c #7CB6D2",
-"P 	c #71C7ED",
-"Q 	c #70C7EE",
-"R 	c #83BDD8",
-"S 	c #0079B6",
-"T 	c #0078B6",
-"U 	c #5B9DD4",
-"V 	c #B4DCF8",
-"W 	c #6BC3EC",
-"X 	c #6FB2D1",
-"Y 	c #99BDCE",
-"Z 	c #6DBEE5",
-"` 	c #6BC2EC",
-" .	c #7BB8D6",
-"..	c #0078B5",
-"+.	c #0077B4",
-"@.	c #B4DBF7",
-"#.	c #65BFE9",
-"$.	c #6CAFD0",
-"%.	c #C7D8E2",
-"&.	c #6EB3D4",
-"*.	c #64BEE9",
-"=.	c #75B4D4",
-"-.	c #0076B3",
-";.	c #0076B2",
-">.	c #B3DAF6",
-",.	c #5FBAE6",
-"'.	c #67ACCE",
-").	c #E7EFF6",
-"!.	c #84B1C9",
-"~.	c #60B9E4",
-"{.	c #5EB9E6",
-"].	c #6EAFD0",
-"^.	c #0075B2",
-"/.	c #0075B1",
-"(.	c #5B9CD3",
-"_.	c #B3DAF5",
-":.	c #59B6E3",
-"<.	c #62A8CB",
-"[.	c #B2C8D5",
-"}.	c #60AFD5",
-"|.	c #58B5E3",
-"1.	c #68ABCE",
-"2.	c #0074B0",
-"3.	c #0074AF",
-"4.	c #B1DAF5",
-"5.	c #52B1E0",
-"6.	c #5CA6C9",
-"7.	c #CDE6F5",
-"8.	c #8CC5E1",
-"9.	c #85C1E1",
-"0.	c #81BFDF",
-"a.	c #7DBEDE",
-"b.	c #71B7D9",
-"c.	c #51B1E0",
-"d.	c #50B1E0",
-"e.	c #4FB0E0",
-"f.	c #4DAFDF",
-"g.	c #4AAEDF",
-"h.	c #5EA5CA",
-"i.	c #0073AF",
-"j.	c #0073AE",
-"k.	c #5B9CD2",
-"l.	c #B0D9F4",
-"m.	c #4CACDE",
-"n.	c #59A2C8",
-"o.	c #B5DCF1",
-"p.	c #BCD7E6",
-"q.	c #EAF4FB",
-"r.	c #5CABD5",
-"s.	c #45A9DD",
-"t.	c #43A8DD",
-"u.	c #41A7DC",
-"v.	c #3FA6DC",
-"w.	c #3DA5DC",
-"x.	c #3CA5DB",
-"y.	c #3AA4DB",
-"z.	c #529EC5",
-"A.	c #0072AD",
-"B.	c #0072AC",
-"C.	c #5B9BD2",
-"D.	c #B0D7F4",
-"E.	c #3DA4DA",
-"F.	c #4D99C3",
-"G.	c #DEF0FB",
-"H.	c #43A3D7",
-"I.	c #67A6C7",
-"J.	c #BAD7E7",
-"K.	c #35A0D7",
-"L.	c #34A0D8",
-"M.	c #4C99C2",
-"N.	c #0071AC",
-"O.	c #0071AB",
-"P.	c #589AD1",
-"Q.	c #AFD6F4",
-"R.	c #2F9CD5",
-"S.	c #4595C0",
-"T.	c #ECF4FC",
-"U.	c #64B0D9",
-"V.	c #3A9ED4",
-"W.	c #CFDEE7",
-"X.	c #EBF4FC",
-"Y.	c #68AACE",
-"Z.	c #4495BF",
-"`.	c #0071AA",
-" +	c #0070AA",
-".+	c #0070A9",
-"++	c #5497CF",
-"@+	c #ACD6F3",
-"#+	c #2997D2",
-"$+	c #4091BE",
-"%+	c #9BC9E7",
-"&+	c #73A5C3",
-"*+	c #E1EFFC",
-"=+	c #D6E9F8",
-"-+	c #3497CD",
-";+	c #3E8FBB",
-">+	c #006FA9",
-",+	c #006FA8",
-"'+	c #4F95CE",
-")+	c #A6D2F2",
-"!+	c #2393CF",
-"~+	c #318FC2",
-"{+	c #2994CE",
-"]+	c #3491C4",
-"^+	c #CFE1F2",
-"/+	c #D6EAFC",
-"(+	c #92C3E1",
-"_+	c #378BB8",
-":+	c #006EA7",
-"<+	c #006EA6",
-"[+	c #4B91CD",
-"}+	c #A2CFF1",
-"|+	c #1F8ECD",
-"1+	c #1E8ECD",
-"2+	c #7DA8C4",
-"3+	c #CBE4FB",
-"4+	c #4699C9",
-"5+	c #3087B5",
-"6+	c #006DA6",
-"7+	c #006DA5",
-"8+	c #468ECB",
-"9+	c #9ECDF1",
-"0+	c #2691CD",
-"a+	c #2590CD",
-"b+	c #2490CD",
-"c+	c #2390CC",
-"d+	c #218FCC",
-"e+	c #1F8ECC",
-"f+	c #3A88B6",
-"g+	c #BEDCF7",
-"h+	c #C0DEFA",
-"i+	c #ACD3F3",
-"j+	c #1D8AC8",
-"k+	c #198ACA",
-"l+	c #188ACA",
-"m+	c #2A82B3",
-"n+	c #016EA5",
-"o+	c #0570A7",
-"p+	c #0972A8",
-"q+	c #4990CC",
-"r+	c #99C8EF",
-"s+	c #3798CF",
-"t+	c #3598CF",
-"u+	c #3497CF",
-"v+	c #3397CF",
-"w+	c #3296CE",
-"x+	c #3093CC",
-"y+	c #8DB1CF",
-"z+	c #B5D9F9",
-"A+	c #B4D8F9",
-"B+	c #6BAFDA",
-"C+	c #2891CC",
-"D+	c #2690CC",
-"E+	c #248FCB",
-"F+	c #218DCA",
-"G+	c #1E8CCA",
-"H+	c #1B8AC9",
-"I+	c #2880B2",
-"J+	c #0C74A9",
-"K+	c #1076AB",
-"L+	c #1378AC",
-"M+	c #177AAD",
-"N+	c #4E92CE",
-"O+	c #8DB5D9",
-"P+	c #9ECBF3",
-"Q+	c #94C7F1",
-"R+	c #85C0EA",
-"S+	c #72B3DF",
-"T+	c #61A7D4",
-"U+	c #539FCD",
-"V+	c #479BCD",
-"W+	c #3F9ACF",
-"X+	c #5394BD",
-"Y+	c #AAD3F8",
-"Z+	c #A9D3F8",
-"`+	c #A8D1F8",
-" @	c #4197CB",
-".@	c #3B99CF",
-"+@	c #3A98CF",
-"@@	c #3897CE",
-"#@	c #3696CE",
-"$@	c #398AB9",
-"%@	c #187BAD",
-"&@	c #1B7CAF",
-"*@	c #1E7EB0",
-"=@	c #2C85B7",
-"-@	c #4E93CB",
-";@	c #6096D1",
-">@	c #45596A",
-",@	c #5A7389",
-"'@	c #6D8CA6",
-")@	c #7EA0C0",
-"!@	c #8FB7DB",
-"~@	c #9ECAF2",
-"{@	c #97C9F3",
-"]@	c #A0CEF7",
-"^@	c #87C1EC",
-"/@	c #469DCF",
-"(@	c #49A0D2",
-"_@	c #489FD1",
-":@	c #469ED1",
-"<@	c #4590BC",
-"[@	c #2884B3",
-"}@	c #378ABD",
-"|@	c #5999CF",
-"1@	c #689AD1",
-"2@	c #486B90",
-"3@	c #45596B",
-"4@	c #59738B",
-"5@	c #6C8AA5",
-"6@	c #7DA1C1",
-"7@	c #8FB9DC",
-"8@	c #98C9F2",
-"9@	c #8CC3EE",
-"0@	c #7DB9E6",
-"a@	c #6DAFDA",
-"b@	c #65A6CE",
-"c@	c #639FD4",
-"d@	c #6B9CD0",
-"e@	c #47688C",
-"f@	c #475C6E",
-"g@	c #5B758C",
-"h@	c #7391AC",
-"i@	c #446385",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"                                        . + @ #                 ",
-"                          $ % & * = - ; > , ' ) ! ~             ",
-"            { ] ^ / ( _ : < [ } } } } } } } | 1 2 3 4 5         ",
-"      6 7 8 9 0 a a a a a a a a a a a a a a b c c c d e f       ",
-"      g h i h h h h h h h h h h h h h h h h j d k k l m n       ",
-"      o p q r s p p p p p p t t t t t t t t u m m v w w x       ",
-"      y z A B C D z z z z z z z z z z z z z E w F F G G H       ",
-"      I J K L M N O P J J J J J J Q Q Q Q Q R G G S T T U       ",
-"      V W X L M M B Y Z W W W W W W ` ` ` `  .T ....+.+.U       ",
-"      @.#.$.L M M M M %.&.#.#.#.#.#.#.#.#.*.=.+.+.-.-.;.U       ",
-"      >.,.'.L M M M M M ).!.~.,.,.,.,.,.,.{.].-.;.^././.(.      ",
-"      _.:.<.L M M M M M M L [.}.|.|.|.|.|.|.1././.2.2.3.(.      ",
-"      4.5.6.L M M M 7.8.9.0.a.b.c.c.d.e.f.g.h.3.3.i.j.j.k.      ",
-"      l.m.n.L M o.p.q.r.s.t.u.v.w.x.y.y.y.y.z.j.j.A.A.B.C.      ",
-"      D.E.F.L G.H.I.L J.K.L.L.L.L.L.L.L.L.L.M.B.B.N.O.O.P.      ",
-"      Q.R.S.T.U.R.V.W.X.Y.R.R.R.R.R.R.R.R.R.Z.O.`. + +.+++      ",
-"      @+#+$+%+#+#+#+&+*+=+-+#+#+#+#+#+#+#+#+;+.+>+,+,+,+'+      ",
-"      )+!+~+{+!+!+!+]+^+/+(+!+!+!+!+!+!+!+!+_+,+:+:+:+<+[+      ",
-"      }+|+|+|+1+1+1+|+2+3+3+4+1+1+1+1+1+1+1+5+<+6+7+7+7+8+      ",
-"      9+0+0+a+b+c+d+e+f+g+h+i+j+k+k+k+k+l+l+m+7+7+n+o+p+q+      ",
-"      r+s+t+u+v+v+w+w+x+y+z+A+B+C+D+E+F+G+H+I+p+J+K+L+M+N+      ",
-"      O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@.@+@@@#@$@%@&@*@=@-@;@      ",
-"            >@,@'@)@!@~@{@]@]@]@^@/@(@_@_@:@<@[@}@|@1@2@        ",
-"                          3@4@5@6@7@8@9@0@a@b@c@d@e@            ",
-"                                        f@g@h@i@                ",
-"                                                                ",
-"                                                                ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/install b/ubuntu/_base/applications/misc/fusion-icon/debian/install
deleted file mode 100644
index 7d4e26567..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.xpm usr/share/pixmaps
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/links b/ubuntu/_base/applications/misc/fusion-icon/debian/links
deleted file mode 100644
index 51627e83a..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-opt/trinity/share/icons/hicolor/48x48/apps/fusion-icon.png opt/trinity/share/pixmaps/fusion-icon.png
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/manpages b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
deleted file mode 100644
index 3ba122a39..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.1
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/menu b/ubuntu/_base/applications/misc/fusion-icon/debian/menu
deleted file mode 100644
index e85a21dbf..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(fusion-icon-trinity): needs="X11" section="Applications/System/Administration" title="Compiz Fusion Icon [Trinity]" \
- command="/opt/trinity/bin/fusion-icon" icon="/opt/trinity/share/pixmaps/fusion-icon.xpm"
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat b/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
deleted file mode 100644
index fbc70a624..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
+++ /dev/null
@@ -1,260 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-#   This class is designed to work with Python packages using the
-#   'distutils' build system and comply to the new policy established
-#   during summer 2006.  Use of the debhelper class to make use of the
-#   new dh_python is strongly advised.  (This is still left as optional
-#   in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy.  Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior.  The pysupport and
-# pycentral methods are available to comply with new policy.  Don't forget
-# to update your 'debian/control'.  (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
-  ifeq (, $(cdbs_selected_pycompat))
-    cdbs_pycompat = 2
-  endif # use pycompat
-  # warning pysupport compatibility mode
-  ifneq (, $(cdbs_use_xs_field))
-    $(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
-  endif # use XS field (compat)
-else
-  ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
-    ifeq (, $(cdbs_selected_pycompat))
-      cdbs_pycompat = 2
-    endif # use pycompat
-  else
-    ifneq (, $(DEB_PYTHON_SYSTEM))
-      $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
-    else
-      ifneq (, $(cdbs_use_xs_field))
-        $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-      endif
-      ifneq (, $(cdbs_selected_pycompat))
-        ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
-          $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-        endif
-      endif # use pycompat
-    endif # unknown method
-  endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION = 
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating.  Here is some documentation:)
-$(warning   http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning   http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'.  Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
-	cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-
-# This class can optionally utilize debhelper's "dh_python" command.  Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule.  In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
-	-python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : 
-	-python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
-  # check if current is in build versions
-  ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
-    cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
-    cdbs_python_build_versions := $(cdbs_python_compile_version)
-  else
-    cdbs_python_build_versions := $(cdbs_python_current_version)
-  endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
-  ifneq (, $(cdbs_python_compile_version))
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
-  else
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
-  endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
-	cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
-	cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
-	touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
-	cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
-	cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
-	echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
-	rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
-	find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
deleted file mode 100755
index a0c6906dd..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/rules
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  include debian/python-distutils-custom.mk
-else
-  include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-post-patches::
-	# make sure that python binary exists
-	# since the existing code is still dependent on python2
-	# and cdbs uses python as the default binary name
-	test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-binary-install/fusion-icon-trinity::
-	mkdir -p debian/fusion-icon-trinity/usr/local/lib
-	cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
-	rm -rf debian/fusion-icon-trinity/usr/local
-	mkdir -p debian/fusion-icon-trinity/temp
-	mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
-	mkdir -p debian/fusion-icon-trinity/opt/trinity
-	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
-	rm -rf debian/fusion-icon-trinity/usr
-	${DH_PYTHON2} -pfusion-icon-trinity
-	### 
-	# Must be done after invoking dh_pysupport, otherwise python scripts will
-	# end up in /usr/share/pyshare instead of dist-packages
-	mkdir -p debian/fusion-icon-trinity/usr
-	mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
-	rm -rf debian/fusion-icon-trinity/temp
-	###
-	mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity
-	mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/
-	rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity
-	dh_icons
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/compat b/ubuntu/_base/applications/misc/kcmldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/control b/ubuntu/_base/applications/misc/kcmldap/debian/control
index f67cb5723..8c186e3cc 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/control
+++ b/ubuntu/_base/applications/misc/kcmldap/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-bonding-trinity
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/rules b/ubuntu/_base/applications/misc/kcmldap/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/misc/kcmldap/debian/rules
+++ b/ubuntu/_base/applications/misc/kcmldap/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
index 9b6de5bbe..5deaed124 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
+++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-controller-trinity
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules
+++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
index 072371003..dfe2ad545 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
+++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-manager-trinity
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules b/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules
+++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/compat b/ubuntu/_base/applications/misc/kerberostray/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/compat
+++ b/ubuntu/_base/applications/misc/kerberostray/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/control b/ubuntu/_base/applications/misc/kerberostray/debian/control
index 0af0907f4..175abde8f 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/control
+++ b/ubuntu/_base/applications/misc/kerberostray/debian/control
@@ -2,7 +2,7 @@ Source: kerberostray-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kerberostray-trinity
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/rules b/ubuntu/_base/applications/misc/kerberostray/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/misc/kerberostray/debian/rules
+++ b/ubuntu/_base/applications/misc/kerberostray/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/README.source b/ubuntu/_base/applications/misc/krecipes/debian/README.source
deleted file mode 100644
index b1eacedd0..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses CDBS as build system.  See /usr/share/doc/cdbs/cdbs-doc.{html|pdf.gz}.
-
-This package uses quilt for patch management.  See /usr/share/doc/quilt/README.gz.
-
- -- Matthias Julius <mdeb@julius-net.net>, Fri, 27 Mar 2009 15:32:58 -0400
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/compat b/ubuntu/_base/applications/misc/krecipes/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/compat
+++ b/ubuntu/_base/applications/misc/krecipes/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/control b/ubuntu/_base/applications/misc/krecipes/debian/control
index 4c32c8ee2..f5713e04d 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/control
+++ b/ubuntu/_base/applications/misc/krecipes/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Matthias Julius <mdeb@julius-net.net>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
 Standards-Version: 3.8.1
 Homepage: http://krecipes.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
index 8c3677c1a..505a983a2 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
+++ b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/share/apps
 debian/tmp/opt/trinity/share/icons
 debian/tmp/opt/trinity/share/locale
+debian/tmp/opt/trinity/share/man/man1/krecipes.1
 debian/tmp/opt/trinity/share/mimelnk
-
-debian/krecipes.xpm	opt/trinity/share/pixmaps/
+debian/tmp/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
deleted file mode 100644
index 196cdc430..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/krecipes.1
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install
index b40fc39e9..2541a2c6c 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install
+++ b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install
@@ -1,3 +1,2 @@
 debian/tmp/opt/trinity/bin
-
-debian/tmp/opt/trinity/share/applnk/Utilities/krecipes.desktop opt/trinity/share/applications/
+debian/tmp/opt/trinity/share/applications
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
deleted file mode 100644
index 6fd5c88d0..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
+++ /dev/null
@@ -1,4 +0,0 @@
-# Don't warn about missing icon file as this is in the -data package
-krecipes-trinity binary: menu-icon-missing /opt/trinity/share/pixmaps/krecipes.xpm
-# Don't warn about missing man page as this is in the -data package
-krecipes-trinity binary: binary-without-manpage opt/trinity/bin/krecipes
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1 b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
deleted file mode 100644
index aaf56f777..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
+++ /dev/null
@@ -1,187 +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 KRECIPES 1 "May 2009"
-.\" 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
-Krecipes \- The TDE Cookbook
-.SH SYNOPSIS
-.B krecipes
-[Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-.B Krecipes
-is a program that lets you to manage your recipes, create shopping
-lists, choose a recipe based on available ingredients and plan your
-menu/diet in advance.
-.PP
-This manual page briefly describes its command line options.
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-\-convert-sqlite3
-Convert the current SQLite 2.x database to SQLite 3 and exit
-.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 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 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
-.TP
-.B \-\-nofork
-Don't run in the background.
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/krecipesrc
-.B Krecipes
-configuration file
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You
-can also enter the URL
-.BR help:/krecipes/
-directly into konqueror or you can run
-.BR "khelpcenter help:/krecipes/"
-from the command\-line.
-
-.SH AUTHORS
-.nf
-Jason Kivlighn <jkivlighn@gmail.com>
-.br
-Unai Garro <ugarro@users.sourceforge.net>
-.br
-Cyril Bosselut <bosselut@b1project.com>
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors
-directly.
-.PP
-This manual page was written by Matthias Julius <mdeb@julius-net.net>,
-for the Debian project (and 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
-version 2 can be found in /usr/share/common\-licenses/GPL\-2.
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.xpm b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.xpm
deleted file mode 100644
index a99416613..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.xpm
+++ /dev/null
@@ -1,227 +0,0 @@
-/* XPM */
-static char *krecipes[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 189 2",
-"   c #000000",
-".  c #0A0A17",
-"X  c #383857",
-"o  c #242373",
-"O  c #4C4C4C",
-"+  c #555555",
-"@  c blue",
-"#  c #6A37BF",
-"$  c #4040A3",
-"%  c #656596",
-"&  c #4B4ACD",
-"*  c #4E45FF",
-"=  c #4C49FE",
-"-  c #5F52E4",
-";  c #5454FF",
-":  c #5D5DFF",
-">  c #6E5ACE",
-",  c #6363DF",
-"<  c #6760EF",
-"1  c #6666FF",
-"2  c #6A6AFF",
-"3  c #726DF4",
-"4  c #7474FE",
-"5  c #7A7AFF",
-"6  c #800000",
-"7  c #9D0000",
-"8  c #9A133A",
-"9  c #AA0000",
-"0  c #B20000",
-"q  c #BD0101",
-"w  c #BB0F0D",
-"e  c #B41F1F",
-"r  c #B81717",
-"t  c #A91B4F",
-"y  c #A96A6A",
-"u  c #A6747F",
-"i  c #BA7E62",
-"p  c #C30000",
-"a  c #C90202",
-"s  c #D21A1A",
-"d  c #CC2C2C",
-"f  c #D62626",
-"g  c #D13838",
-"h  c red",
-"j  c #E02A2A",
-"k  c #E16A24",
-"l  c #C24848",
-"z  c #CC4242",
-"x  c #C75150",
-"c  c #D64545",
-"v  c #D85151",
-"b  c #DD5C5C",
-"n  c #C36160",
-"m  c #C27371",
-"M  c #D96161",
-"N  c #DB7272",
-"B  c #E04242",
-"V  c #EA555F",
-"C  c #EC6565",
-"Z  c #892D89",
-"A  c #916A9C",
-"S  c #B54C84",
-"D  c #867EED",
-"F  c #DC8225",
-"G  c #DF8F2E",
-"H  c #DE9134",
-"J  c #ED961A",
-"K  c #FE9E00",
-"L  c #E99420",
-"P  c #FEA005",
-"I  c #FAA71E",
-"U  c #D4914E",
-"Y  c #D89449",
-"T  c #CD966B",
-"R  c #D8A778",
-"E  c #E88572",
-"W  c #F6B343",
-"Q  c #F9B545",
-"!  c #FFC25C",
-"~  c #F5C16C",
-"^  c #FFC564",
-"/  c #F5C473",
-"(  c #818181",
-")  c #AB8BA7",
-"_  c gray64",
-"`  c #AEACAB",
-"'  c #B1B1AE",
-"]  c #B4B3B1",
-"[  c #B8B7B4",
-"{  c #BDBCBA",
-"}  c #9C86C3",
-"|  c #9483D6",
-" . c #9696DB",
-".. c #9C9CD9",
-"X. c #8484FE",
-"o. c #8B8BFE",
-"O. c #9489E6",
-"+. c #9D9DE2",
-"@. c #9393F5",
-"#. c #9392FD",
-"$. c #9C9CFD",
-"%. c #A09FF8",
-"&. c #A3A3D9",
-"*. c #AAAADB",
-"=. c #B2B2DA",
-"-. c #A7A7E0",
-";. c #AFAFE6",
-":. c #ACACE8",
-">. c #A4A3F6",
-",. c #A3A3FD",
-"<. c #ABAAF4",
-"1. c #ABABFE",
-"2. c #B5ABE4",
-"3. c #B5B5E4",
-"4. c #B6B6EF",
-"5. c #B9B9E3",
-"6. c #BCBCED",
-"7. c #B2B1F3",
-"8. c #B3B3FE",
-"9. c #BDBCF4",
-"0. c #BBBBFD",
-"q. c #C48483",
-"w. c #C49481",
-"e. c #C59492",
-"r. c #DE8484",
-"t. c #C5A3A1",
-"y. c #C9B2AF",
-"u. c #C0BFBD",
-"i. c #DBBFBF",
-"p. c #E99D8D",
-"a. c #E19898",
-"s. c #F78D8D",
-"d. c #FF8282",
-"f. c #E59BAB",
-"g. c #E7A5A4",
-"h. c #E2A8A8",
-"j. c #E8BBBA",
-"k. c #F4ADAA",
-"l. c #FCB5B5",
-"z. c #C1C0BE",
-"x. c #EFC28E",
-"c. c #E5C5B4",
-"v. c #F6D6A2",
-"b. c #C5C4C3",
-"n. c #C8C6C5",
-"m. c #C9C8C6",
-"M. c #CDCBCA",
-"N. c #D0CECD",
-"B. c #D1D0CD",
-"V. c #DED0CF",
-"C. c #D5D3D2",
-"Z. c #DAD5D3",
-"A. c #DAD8D6",
-"S. c #DDDCDB",
-"D. c #C0C0F4",
-"F. c #C1C1FC",
-"G. c #CCCBF4",
-"H. c #D7D7F7",
-"J. c #D4D4FD",
-"K. c #DBDBF7",
-"L. c #DEDDF8",
-"P. c #E1CFCE",
-"I. c #E8C6C5",
-"U. c #EDCACA",
-"Y. c #E2DDDC",
-"T. c #EAD1D0",
-"R. c #FDC6C6",
-"E. c #F5D3D3",
-"W. c #F0DADA",
-"Q. c #FBD6D8",
-"!. c #FADEDD",
-"~. c #E1E0DE",
-"^. c #FAE8CE",
-"/. c #FAEBD3",
-"(. c #E3E3E2",
-"). c #E8E7E6",
-"_. c #E8E8E7",
-"`. c #ECEBEA",
-"'. c #E4E4FF",
-"]. c #EBEBFD",
-"[. c #F2E7E7",
-"{. c #F1EEEE",
-"}. c #FBE4E4",
-"|. c #FFEBEB",
-" X c #F0F0EF",
-".X c #F3F3F2",
-"XX c #FBF5F5",
-"oX c #FEFDFD",
-"OX c None",
-/* pixels */
-"OXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOX' y p OXOXOXOXOXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOXOXOXOXOX+ z.M.Z.z p OXOXOXOXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOXOXOXOX( C.C.S.n.C.x a OXOXOXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOXOXOX_ S.C.S.B.).m.B.n p OXOXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOXOX{ _.S.).(.n.Y.~.m.n.m q OXOXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOX( C. X`._.S.(.Y.z.S.A.[ Z.q.w h OXOXOXOXOXOXOX",
-"OXOXOXOXO _ n.n.m.S..X.X X`.(.(.z.(.M.m.u.u.M.e.r q OXOXOXOXOXOX",
-"OX  { M.S.(.S.S.(.(.`..X.X X_.S.~.' Y.[ N.' m.u.t.e 9 OXOXOXOXOX",
-"OXp m.XX).).S.(.(.(.~..X.X.X`.`.A.Y.' Z.` N.` N.u.y.l 9 OXOXOXOX",
-"OX0 d W.`.).(.(.(.S.(..X.X X.X_._.u.B.[ m.[ n.] A.W.|.f 9 OXOXOX",
-"OXOXq g `. XS.(.(.). X)..X X X X`.A.z.u.z.u.u.Z.}.oXl.s OXOXOXOX",
-"OXOXOXp c {._..X.X.X.X].A. X X X X`.b.C.] M.P.XXoXs.a OXOXOXOXOX",
-"OXOXOXOXp v .X).(.(.S.N.S.S.S.`. X`._.{ S.P.oXXXC q OXOXOXOXOXOX",
-"OXOXOXOXOXa b .X_.(.(.(.S.S.S.S.`.{._.Y.T.oX}.B 0 OXOXOXOXOXOXOX",
-"OXOXOXOXOXOXa N .X(.S.(.S.S.S.S.(.{.Y.j.oXR.f 6 OXOXOXOXOXOXOXOX",
-"OXOXOXOXOXOX  p r..XY.). X`.V.U.!.oXoXd.V Z = * OXOXOXOXOXOXOXOX",
-"OXOXOXOXOX      8 a. XI.E.oXoXoXoXQ.f.S # = = = = OXOXOXOXOXOXOX",
-"OXOXOXOXOX    o = t h.oXoX!.k.E k F R i u A > = = ; OXOXOXOXOXOX",
-"OXOXOXOXOX    & = c.b g.p.x.~ W P ^ Q K K K K G - $       OXOXOX",
-"OXOXOXOXOXOXOX1 < ^./.v./ W I K K ! K K K K K K } .       OXOXOX",
-"OXOXOXOXOXOXOX2 $.3 ) T Y L K K K K K J H U w.2.X       OXOXOXOX",
-"OXOXOXOXOXOXOX2 ].J.4 2 4 4 5 O.| O.#.$.,.1.1.8.% < OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX2 '.oX].X.4 5 X.X.o.#.$.,.,.1.8.7. .4 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX2 '.oX].H.>.X.X.o.#.$.$.1.1.8.8.-...4 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX1 '..XH.G.9.7.$.$.$.$.1.1.8.8.:.*...5 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX2 H.L.G.9.7.>.>.$.$.,.1.1.8.7.;.*.&.4 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX2 F.G.9.7.>.>.$.$.$.1.1.8.9.4.3.=.*.5 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX2 #.D.7.<.>.$.$.,.1.1.0.0.0.6.5.=.+.4 OXOXOXOXOXOX",
-"OXOXOXOXOXOXOX1 2 X.>.>.$.$.,.,.1.8.0.F.F.6.5.+.5 : OXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOX: 2 4 5 o.$.1.1.1.0.0.F.<.@.4 4 ; OXOXOXOXOXOXOX",
-"OXOXOXOXOXOXOXOXOXOX@ 1 2 4 5 5 5 5 5 5 4 1 X.OXOXOXOXOXOXOXOXOX"
-};
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules
index e3708987f..a40072965 100755
--- a/ubuntu/_base/applications/misc/krecipes/debian/rules
+++ b/ubuntu/_base/applications/misc/krecipes/debian/rules
@@ -1,42 +1,18 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-binary-install/krecipes-trinity::
-	install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-		debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-
-binary-install/krecipes-data-trinity::
-	dh_testdir
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	dh_testdir
-	rm -f debian/stamp-bootstrap
+-include /usr/share/cdbs/1/class/tde.mk
+
+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"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/watch b/ubuntu/_base/applications/misc/krecipes/debian/watch
deleted file mode 100644
index 9bc512dee..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-version=3
-
-opts="uversionmangle=s/-/~/" \
-  http://sf.net/krecipes/krecipes-(.+)\.tar\.gz
\ No newline at end of file
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..0dbd9f84e 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -1,28 +1,32 @@
-debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+debian/tmp/opt/trinity/share/man/man1/amarokapp.1
+debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1
+debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1
+debian/tmp/opt/trinity/share/man/man1/amarok.1
+debian/tmp/opt/trinity/share/services/amarokitpc.protocol
+debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
+debian/tmp/opt/trinity/share/services/amarokpcast.protocol
+debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
+debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
 
 #libkarma is not in MAIN yet
 #debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
@@ -31,8 +35,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
 debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
 debian/tmp/opt/trinity/bin/amarok
 debian/tmp/opt/trinity/bin/amarokapp
 debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/compat
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..71ae19765 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -4,24 +4,24 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2,
  tdelibs14-trinity-dev, tdebase-trinity-dev,
- libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+ libakode-dev, libxine2-dev | libxine-dev,
  libtag1-dev, libsqlite3-dev,
  default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
- libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby-dev
+ libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev,
+ ruby, ruby-dev, dh-python
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
 
 Package: amarok-trinity
 Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
- python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
+ python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -45,20 +45,30 @@ Description: versatile and easy to use audio player for Trinity
  Support for libvisual visualization plugins is also compiled in (you need 
  to have libvisual-0.4-plugins installed to be able to use it).
 
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
 Package: amarok-common-trinity
 Architecture: all
-Depends: ruby
+Depends: ruby, ${python3:Depends}
 Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby-trinity, python-all, python-tqt
+Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
  'amarok' package installed, you will hardly find this package useful.
  .
  You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
+ and/or playlist2html scripts. You will also need python3-pytqt for the
  WebControl script.
 
 Package: amarok-konqsidebar-trinity
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
 Package: amarok-engines-trinity
 Architecture: all
 Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
 Replaces: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Breaks: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
  for some reason over the other engines (e.g., it is the lightest engine
  Dependency-wise).
 
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
 Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/docs b/ubuntu/_base/applications/multimedia/amarok/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
deleted file mode 100644
index 821ec48c7..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE"
-.SH NAME
-amarok
-\- An audio player for TDE
-.SH SYNOPSIS
-amarok [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.SH OPTIONS
-.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 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 
-.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.
-.SS 
-.SS Arguments:
-URL(s)                    Files/URLs to Open
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-previous  
-Skip backwards in playlist
-.TP
-.B \-p,  \-\-play  
-Start playing current playlist
-.TP
-.B \-s,  \-\-stop  
-Stop playback
-.TP
-.B  \-\-pause  
-Pause playback
-.TP
-.B \-f,  \-\-next  
-Skip forwards in playlist
-.SS 
-.SS Additional options:
-.TP
-.B \-e,  \-\-enqueue  
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok 
-itself when needed and is not supposed to be invoked manually by user.
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 91ff8b6aa..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index c67cd917f..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) 
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s)                 Folders to scan
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-recursive  
-Scan folders recursively
-.TP
-.B \-i,  \-\-incremental  
-Incremental Scan (modified folders only)
-.TP
-.B \-p,  \-\-importplaylists  
-Import playlist
-.TP
-.B \-s,  \-\-restart  
-Restart the scanner at last position, after a crash []
-.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 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..f46d2b2dd 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -15,4 +14,11 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
  -DWITH_IFP="OFF"
+
+binary-install/amarok-common-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+		/opt/trinity/share/apps/amarok/scripts/playlist2html
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+		/opt/trinity/share/apps/amarok/scripts/webcontrol
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/compat b/ubuntu/_base/applications/multimedia/codeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/compat
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/control b/ubuntu/_base/applications/multimedia/codeine/debian/control
index 03cba509a..c8a101f59 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/control
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/control
@@ -2,7 +2,7 @@ Source: codeine-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev
 Standards-Version: 3.7.3
 Homepage: http://codeine.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/patches/series b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/rules b/ubuntu/_base/applications/multimedia/codeine/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/codeine/debian/rules
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
index a33db1b1e..7a9c5ef6b 100644
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
index 6a65ab1bb..c2016c2de 100755
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7b99dabec..7b65b9a3f 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,8 +1,5 @@
 remove build-dep on libdvdread-dev
 
-libk3b3-extracodecs conflicts libk3b2-extracodecs
-transitional libk3b2-extracodecs package
-
 Do not recommend on tdebase-tdeio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
index d5bd13a60..24801c359 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/control
@@ -5,8 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends:
- cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
- tdelibs14-trinity-dev, libdbus-tqt-1-dev,
+ tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
  libdvdread-dev, libasound2-dev, lame, libmp3lame-dev,
  libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev,
  libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev
@@ -64,7 +63,7 @@ Section: libs
 Architecture: any
 Replaces: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
-Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
+Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity
 Depends: ${shlibs:Depends}
 Description: The TDE cd burning application library - runtime files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
@@ -79,7 +78,6 @@ Architecture: any
 Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Conflicts: libk3b2-mp3-trinity
 Description: The TDE cd burning application library - extra decoders [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -87,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity]
  .
  This package contains runtime libraries for the MP3 and FFMPEG decoder plugin.
 
-Package: libk3b2-extracodecs-trinity
-Architecture: all
-Priority: extra
-Replaces: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Breaks: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Depends: libk3b3-extracodecs-trinity
-Description: transitional package for K3b's extra decoders [Trinity]
- This is a dummy transitional package to enable a smooth transition from
- libk3b2-extracodecs to libk3b3-extracodecs.
- It may safely be removed after installation.
-
 Package: k3b-trinity-dbg
 Priority: extra
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
deleted file mode 100644
index 3b3a0add7..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/apps/*
-usr/share/icons/*
-usr/share/kde/*
-usr/share/sounds/*
-usr/share/doc/tde/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
deleted file mode 100644
index b7175c514..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/tmp/usr/share/applnk/.hidden/*
-debian/tmp/usr/share/apps/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/tde/*
-debian/tmp/usr/share/sounds/*
-debian/tmp/usr/share/mimelnk/*
-debian/tmp/usr/share/services/*
-debian/k3b-rip-audiocd.desktop usr/share/kde4/apps/solid/actions
-debian/k3b-rip-videodvd.desktop usr/share/kde4/apps/solid/actions
-debian/k3b-write-iso-image.desktop usr/share/kde4/services/ServiceMenus
-debian/k3b-write-bin-image.desktop usr/share/kde4/services/ServiceMenus
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
deleted file mode 100644
index 08ca27b5f..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
+++ /dev/null
@@ -1,207 +0,0 @@
-.TH K3B "1" "December 2002" TDE "TDE Application"
-.SH NAME
-k3b \- TDE CD burning program
-.SH SYNOPSIS
-.B k3b
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B k3b
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-K3b is a CD burning program that has two aims:
-usability and as many features as possible.
-.P
-This program is part of the official TDE extra gear #1 module.
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-File(s)
-file(s) to open
-.SS "General Options"
-.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\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Options:"
-.B \-\-datacd
-Create a new data CD project and add all given files
-.TP
-.B \-\-audiocd
-Create a new audio CD project and add all given files
-.TP
-.B \-\-videocd
-Create a new video CD project and add all given files
-.TP
-.B \-\-mixedcd
-Create a new mixed mode CD project and add all given files
-.TP
-.B \-\-emovixcd
-Create a new eMovix CD project and add all given files
-.TP
-.B \-\-datadvd
-Create a new data DVD project and add all given files
-.TP
-.B \-\-emovixdvd
-Create a new eMovix DVD project and add all given files
-.TP
-.B \-\-copycd
-Open the CD copy dialog
-.TP
-.B \-\-clonecd
-Open the CD cloning dialog
-.TP
-.B \-\-cdimage
-Write an ISO image or Bin/Cue image to cd
-.TP
-.B \-\-erasecd
-Erase a CDRW
-.TP
-.B \-\-formatdvd
-Format a DVD-RW or DVD+RW
-.TP
-.BI \-\-lang \ language
-Set the GUI language
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-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
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-K3b was written by
-.nh
-.ad l
-Sebastian Trueg <trueg@informatik.uni-freiburg.de>
-and Thomas Froescher <tfroescher@gmx.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/k3b
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/k3b
-
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
index a72c0b374..8c6643cf2 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
@@ -1,5 +1,7 @@
 debian/tmp/opt/trinity/bin/*
-debian/tmp/opt/trinity/share/applications/*
-debian/k3b.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la
+debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/k3b.1
+
+debian/k3b.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
deleted file mode 100644
index 328f16efe..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b-trinity.1
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
deleted file mode 100644
index d6388a5b6..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/applications/*
-usr/share/mimelnk/*
-usr/share/pixmaps/*
-usr/share/services/*
-usr/bin/*
-etc/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
deleted file mode 100644
index 134bb0bf2..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/applications/*
-debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/trinity/tdefile_k3b.so
-debian/tmp/usr/lib/trinity/tdefile_k3b.la
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
deleted file mode 100644
index 60dde70bc..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b.1
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
deleted file mode 100644
index e3ec0ef1f..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(k3b-trinity):\
-	needs="X11"\
-	section="Applications/File Management"\
-	title="K3b"\
-	command="/opt/trinity/bin/k3b"\
-	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
deleted file mode 100644
index 3807d55e6..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	configure)
-
-	# Remove bad files 
-	if dpkg --compare-versions "$2" eq "0.10.3-1"; then
-		rm -rf /usr/share/applnk/.hidden
-		rm -rf /usr/share/applnk/System/k3b.desktop
-	fi
-	
-	if dpkg --compare-versions "$2" lt "0.10.3-1"; then
-		rm -rf /usr/share/applnk/System/k3b.desktop
-		rm -rf /usr/share/applnk/System/k3bsetup.desktop
-	fi
-
-	;;	
-abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
deleted file mode 100644
index d45003d06..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*.la
-usr/lib/*.so
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
deleted file mode 100644
index 6257a06d1..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libk3b.so
-debian/tmp/usr/lib/libk3bdevice.so
-debian/tmp/usr/include/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
deleted file mode 100644
index 0e57a97dc..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/trinity/libk3bmaddecoder.*
-#debian/tmp/usr/lib/trinity/libk3bffmpegdecoder.*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
deleted file mode 100644
index d77e53e7c..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*.so.*
-usr/lib/libk3baudio*.{so,la}
-usr/lib/trinity/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
deleted file mode 100644
index 69b7f7909..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
+++ /dev/null
@@ -1,25 +0,0 @@
-debian/tmp/usr/lib/libk3b.so.*
-debian/tmp/usr/lib/libk3bdevice.so.*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.la
-debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.so
-debian/tmp/usr/lib/trinity/libk3bexternalencoder.la
-debian/tmp/usr/lib/trinity/libk3bexternalencoder.so
-debian/tmp/usr/lib/trinity/libk3bflacdecoder.la
-debian/tmp/usr/lib/trinity/libk3bflacdecoder.so
-debian/tmp/usr/lib/trinity/libk3bmpcdecoder.la
-debian/tmp/usr/lib/trinity/libk3bmpcdecoder.so
-debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.la
-debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.so
-debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.la
-debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.so
-debian/tmp/usr/lib/trinity/libk3bsoxencoder.la
-debian/tmp/usr/lib/trinity/libk3bsoxencoder.so
-debian/tmp/usr/lib/trinity/libk3bwavedecoder.la
-debian/tmp/usr/lib/trinity/libk3bwavedecoder.so
-debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so
-debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la
-debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so
-debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/usr/lib/trinity/tdeio_videodvd.so
-debian/tmp/usr/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules
index 72db8e489..d7869c2ea 100755
--- a/ubuntu/_base/applications/multimedia/k3b/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules
@@ -1,8 +1,15 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API         = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX      = t64
+else
+DEB_TIME64_SUFFIX      =
+endif
+
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -14,3 +21,48 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DWITH_ALL_OPTIONS="ON"
+
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libk3b3-trinity\." | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	   [ -d $$a ] || [ -f $$a.t64 ] || \
+	   (cp -a $$a debian/libk3b3$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	   -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	   -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \
+	   -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	   debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	   mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	   -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	   -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \
+	   -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	   debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/watch b/ubuntu/_base/applications/multimedia/k3b/debian/watch
deleted file mode 100644
index 7e3c554ae..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/k3b/k3b-([\d.]*).tar.bz2
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
@@ -1,2 +1,2 @@
-9
+10
 
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control
index c0784a2c0..bbbbc222c 100644
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/control
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/control
@@ -3,7 +3,8 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, tde-cdbs, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ libdvdread-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev
 Standards-Version: 3.8.4
 
 Package: k9copy-trinity
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
deleted file mode 100644
index 96001a6ad..000000000
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>anthony.mercatante@laposte.net</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2005-07-28</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>k9copy</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>k9copy</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      DVD copy tool for TDE.
-    </para>
-    <para>
-      k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. k9copy has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>anthony.mercatante@laposte.net</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
index aca7b475b..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
@@ -1,43 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/k9copy-trinity::
-	dh_installman k9copy.1
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-
-build/k9copy-trinity::
-	docbook2x-man debian/k9copy.1.docbook
-
-clean::
-	rm -f k9copy.1
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
deleted file mode 100644
index 7e3c2a0fd..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
+++ /dev/null
@@ -1,27 +0,0 @@
-kaffeine-mozilla-trinity (0.4.3.1.dfsg-0.2) karmic; urgency=low
-
-  * Karmic upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 07 Dec 2009 00:26:00 -0600
-
-kaffeine-mozilla (0.4.3.1.dfsg-0.1) unstable; urgency=low
-
-  * Non-maintainer upload
-  * Repackaging source package; removing unclear licensed jri*.h files
-    (Closes: 322961)
-  * Removed the sources put in twice
-  * Found the missing jri*.h files and jni*.h-files in mozilla-dev
-    and changed the path to prtypes.h to make them usable.
-    New files introduced in the diff.gz
-  * Built and tested.
-
- -- Sune Vuorela <debian@pusling.com>  Wed, 14 Jun 2006 02:21:30 +0200
-
-kaffeine-mozilla (0.4.3.1-1) unstable; urgency=low
-
-  * This version corresponds to '0.2' upstream.
-  * kaffeine-mozilla has been split from kaffeine at the source level
-    upstream. Redid packaging.
-
- -- Zack Cerza <zcerza@coe.neu.edu>  Thu, 13 May 2004 18:28:05 -0400
-
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
deleted file mode 100644
index 514747b65..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: kaffeine-mozilla-trinity
-Section: web
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev
-Standards-Version: 3.8.4
-
-Package: kaffeine-mozilla-trinity
-Architecture: any
-Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends}
-Replaces: kaffeine-mozilla-kde3 (<< 4:14.0.0~), kaffeine-mozilla-trinity (<< 4:14.0.0~)
-Breaks: kaffeine-mozilla-kde3 (<< 4:14.0.0~), kaffeine-mozilla-trinity (<< 4:14.0.0~)
-Description: mozilla plugin that lanches kaffeine for supported media types [Trinity]
- This mozilla plugin launches kaffeine, the xine-based media player for TDE,
- when a page containing a supported media format is loaded.
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
deleted file mode 100644
index d7092f934..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-This package was debianized by Zack Cerza <zcerza@coe.neu.edu> on
-Sun, 28 Mar 2004 22:55:09 -0500.
-
-It was downloaded from http://kaffeine.sourceforge.net
-
-Upstream Author: Jürgen Kofler
-
-This software is copyright (c) Jürgen Kofler
-
-You are free to distribute this software under the terms of the GNU General Public License. On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
index 52db3bce8..b7f117dfd 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/control
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
  Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
  libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev,
  libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev,
  libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
index a285abe80..62244d529 100644
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/control
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
- libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev,
  libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
  libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev,
  koffice-trinity-dev
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/rules b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/compat b/ubuntu/_base/applications/multimedia/kplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/control b/ubuntu/_base/applications/multimedia/kplayer/debian/control
index b964e58cb..5d21c56ed 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/control
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/control
@@ -2,7 +2,7 @@ Source: kplayer-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kplayer.sourceforge.net/
 #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/docs b/ubuntu/_base/applications/multimedia/kplayer/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/rules b/ubuntu/_base/applications/multimedia/kplayer/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
index aed8fbc85..e3db7ecc0 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
@@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.2
 
 Package: mplayerthumbs-trinity
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/compat b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
index f2b7ad8d6..2a7eb7535 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/control
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblirc-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
deleted file mode 100644
index b420ba197..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006"
-
-.SH NAME
-
-rosegarden-audiofile-importer - Helper application to convert and
-import audio files for Rosegarden.
-
-.SH SYNOPSIS
-
-rosegarden-audiofile-importer -t [<version>]
-rosegarden-audiofile-importer --conftest [<version>]
-rosegarden-audiofile-importer -l [<version>]
-rosegarden-audiofile-importer [-r <rate>] -w <inputfile>
-rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile>
-
-
-.SH OPTIONS
-
-.BR -t " " [<version>], 
-.BR --conftest " " [<version>]
-
-Exit successfully if the importer is available and working [and is
-of at least version <version>].  If some of the required helper
-applications are missing, also print to stdout a line saying
-"Required: application1, application2", listing the missing
-programs.
-
-.BR \-l " " [<version>]
-
-List known file extensions (e.g. ogg wav flac).  Return code is same
-as for -t (so can combine two calls into one)
-
-.BR \-r " " <rate>
-
-Test whether any work is needed to convert the input, either because
-it isn't in a Rosegarden-compatible format or because its samplerate
-differs from <rate>.  Exit successfully if no work is required; return
-error code 2 if conversion required, 3 if resampling required, 4 if
-both required, 1 for other error.
-
-.SH DESCRIPTION
-
-Helper application to convert and import audio files for Rosegarden.
-
-Can take audio files of various kinds as input, always produces WAV
-files that are compatible with Rosegarden as output.
-
-Not actually specific to Rosegarden in any way, except that
-Rosegarden needs to know it can rely on its presence and calling
-interface.
-
-.SH SEE ALSO
-     rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1)
-
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
deleted file mode 100644
index e2aa9f951..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006"
-i
-.SH NAME
-
-rosegardern-lilypondview - display a lilypond file in a postscript
-viewer.
-
-.SH SYNOPSIS
-
-rosegarden-lilypondview [-g] [FILE].ly
-
-.SH DESCRIPTION
-
-This script takes a Lilypond file as input.  It creates a temporary
-sandbox, runs Lilypond against the input file, then opens a PostScript
-viewer against the results in order to provide a graphical, printable
-preview.
-
-This script is used internally by Rosegarden, as the backend for the File -> 
-Export -> Preview Lilypond file feature.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
deleted file mode 100644
index 0da30c2a5..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006"
-
-.SH NAME
-
-rosegarden-project-package - converts between Rosegarden (.rg) files
-and Rosegarden Project (.rgp) files.
-
-.SH SYNOPSIS
-
-orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp]
-
-.SH OPTIONS
-.BR \-\-quiet " " Be silent
-.BR \-\-unpack " " Unpack .rgp file
-.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file
-.BR \-\-conftest " " Test environment for necessary installed components
-
-.SH DESCRIPTION
-
-This program converts between Rosegarden (.rg) files and Rosegarden
-Project (.rgp) files.  It is primarily intended to be used internally and 
-transparently by the Rosegarden application.
-
-A Rosegarden file (.rg) is a single file (in gzipped XML format)
-that defines a Rosegarden composition in terms of events, segments,
-programs, plugin data, references to audio files, and so on.  Some
-of these types of information depend on the presence of external
-files such as the audio files or plugin preset data, without which
-the file cannot be used.
-
-A Rosegarden Project (.rgp) file is a bundle of files, including the
-Rosegarden file itself, as well as any audio file or other external
-data it requires, in compressed form.  A Rosegarden Project file is
-intended to be portable and self-contained, but the Rosegarden
-program itself does not (at the time of writing) understand these
-files directly.
-
-This program can take a Rosegarden file, examine it to find out
-which other data files it uses, and pack it to create the
-corresponding Rosegarden Project file.  Conversely, it can also take
-a Rosegarden Project file and unpack it as a project directory for
-use with Rosegarden.
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..ac05f6185 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
@@ -1,4 +1,8 @@
 debian/tmp/opt/trinity/bin/rosegarden*
 debian/tmp/opt/trinity/bin/rosegardensequencer*
-debian/tmp/opt/trinity/share/mimelnk
 debian/tmp/opt/trinity/share/applications
+debian/tmp/opt/trinity/share/mimelnk
+debian/tmp/opt/trinity/share/man/man1/rosegarden.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-lilypondview.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-project-package.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
deleted file mode 100644
index 6e3b96ee0..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/rosegarden.1
-debian/rosegarden-lilypondview.1
-debian/rosegarden-project-package.1
-debian/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
deleted file mode 100644
index fe750e0b2..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.TH ROSEGARDEN 1 "23 July 2006"
-
-.SH NAME
-
-rosegarden, rosegarden-sequencer - MIDI and audio sequencer and
-musical notation editor.
-
-.SH SYNOPSIS
-
-rosegarden [Qt-options] [TDE-options] [options] [File]
-
-rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2]
-
-.SH DESCRIPTION
-
-This manual page documents briefly the rosegarden and rosegardensequencer commands.
-
-rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment.
-
-rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below.
-
-.SH OPTIONS
-.BR \-\-author " "
-     Show author information.
-
-.BR \-\-help " "
-     Show help about options.
-
-.BR \-\-help-all
-     Show all options.
-
-.BR \-\-help-tde
-     Show TDE specific options.
-
-.BR \-\-help-qt
-     Show Qt specific options.
-
-.BR \-\-license 
-     Show license information.
-
-.BR \-v, \-\-version
-     Show version information.
-
-
-.SH OPTIONS for rosegarden
-
-.BR \-\-nosplash
-     Don\'t show splash screen.
-	
-
-.BR \-\-nosequencer
-     Don\'t use an external sequencer.
-
-.BR \-\-nofork
-     Don\'t automatically run in the background.
-
-.BR \ \--existingsequencer
-     Attach to a running sequencer process, if found.
-
-.BR File
-     File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode>
-     
-.SH QT OPTIONS
-.BR \-\-bg, --background color
-     Sets the default background color and an application palette (light and dark shades are calculated).
-
-.BR \-\-btn, --button color
-     Sets the default button color.
-
-.BR \-\-cmap
-     Causes the application to install a private color map on an 8-bit display.
-
-.BR \-\-display displayname
-     Use the X-server display 'displayname'.
-
-.BR \-\-dograb
-     Running under a debugger can cause an implicit --nograb, use --dograb to override.
-
-.BR \-\-fg, \-\-foreground color
-     Sets the default foreground color.
-
-.BR \-\-fn, \-\-font fontname
-     Defines the application font.
-
-.BR \-\-im XIMserver
-     Set XIM server.
-
-.BR \-\-inputstyle inputstyle
-     Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.
-
-.BR \-\-name name
-     Sets the application name.
-
-.BR \-\-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.
-
-.BR \-\-nograb
-     Tells Qt to never grab the mouse or the keyboard.
-
-.BR \-\-noxim
-     Disable XIM.
-
-.BR \-\-reverse
-     Mirrors the whole layout of widgets.
-
-.BR \-\-session sessionId
-     Restore the application for the given 'sessionId'.
-
-.BR \-\-sync
-     Switches to synchronous mode for debugging.
-
-.BR \-\-title title
-     Sets the application title (caption).
-
-.BR \-\-visual TrueColor
-     Forces the application to use a TrueColor visual on an 8-bit display.
-
-
-.SH TDE OPTIONS
-.BR \-\-caption caption
-     Use 'caption' as name in the titlebar.
-
-.BR \-\-config filename
-     Use alternative configuration file.
-
-.BR \-\-dcopserver server
-     Use the DCOP Server specified by 'server'.
-
-.BR \-\-geometry geometry
-     Sets the client geometry of the main widget.
-
-.BR \-\-icon icon
-     Use 'icon' as the application icon.
-
-.BR \-\-miniicon icon
-     Use 'icon' as the icon in the titlebar.
-
-.BR \-\-nocrashhandler
-     Disable crash handler, to get core dumps.
-
-.BR \-\-style style
-     Sets the application GUI style.
-
-.BR \-\-waitforwm
-     Waits for a WM_NET compatible windowmanager.
-
-.SH SEE ALSO
-     jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1)
-
-
-.SH AUTHOR
-This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts.
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
index 94fe8c0a8..57a056859 100755
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
@@ -5,8 +5,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -21,13 +20,11 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
-DEB_COMPRESS_EXCLUDE += .rg .wav .docbook
+DEB_COMPRESS_EXCLUDE_ALL += .rg .wav .docbook
 
 binary-install/rosegarden-trinity::
 	dh_testdir
 	find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \;
-	cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/
-	rm -rf debian/rosegarden-trinity/usr/share/man
 
 clean::
 	dh_testdir
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
index c7ae17d47..e35d4eca6 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kde-apps.org/content/show.php?content=29024
 
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/patches/series b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/system/kpowersave/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
index fa0a1f580..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
@@ -1,38 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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 $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib
-
-install/soundkonverter-trinity::
-	install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \
-	    debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity
-
-install/soundkonverter-amarok-trinity::
-	chmod 0755 debian/tmp/opt/trinity/share/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
index fcfaef212..485f58a96 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
@@ -2,10 +2,10 @@ opt/trinity/bin/soundkonverter
 opt/trinity/share/applications/tde/soundkonverter.desktop
 opt/trinity/share/apps/soundkonverter/soundkonverterui.rc
 opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-opt/trinity/share/apps/soundkonverter/format_infos/
-opt/trinity/share/apps/soundkonverter/pics/
-opt/trinity/share/apps/soundkonverter/plugins/
-opt/trinity/share/doc/
-opt/trinity/share/icons/
-opt/trinity/share/locale/
-opt/trinity/share/mimelnk/
+opt/trinity/share/apps/soundkonverter/format_infos
+opt/trinity/share/apps/soundkonverter/pics
+opt/trinity/share/apps/soundkonverter/plugins
+opt/trinity/share/doc
+opt/trinity/share/icons
+opt/trinity/share/locale
+opt/trinity/share/mimelnk
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/compat b/ubuntu/_base/applications/multimedia/tderadio/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/compat
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/control b/ubuntu/_base/applications/multimedia/tderadio/debian/control
index dc6584c46..d95be93ed 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/control
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/control
@@ -2,9 +2,9 @@ Source: tderadio-trinity
 Section: sound
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), tdelibs14-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+               liblirc-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev
 Standards-Version: 3.8.4
-Homepage: http://tderadio.sourceforge.net/
 
 Package: tderadio-trinity
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
deleted file mode 100644
index 0a96aa40e..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH CONVERT\-PRESETS 1 "Dec 2005" "Trinity Desktop Environment" "convert-presets"
-.SH NAME
-convert\-presets
-\- convert-presets
-.SH SYNOPSIS
-convert\-presets [Qt\-options] [TDE\-options] [options] [preset files] 
-.SH DESCRIPTION
-convert-presets
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B preset
-files              preset file to convert
-.SS Options:
--q                        be quiet
-.SS 
-.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:/convert\-presets/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/convert\-presets/'"
-from the command-line.
-.br
-.SH AUTHORS
-Ernst Martin Witte, Klas Kalass
-.nf
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/docs b/ubuntu/_base/applications/multimedia/tderadio/debian/docs
index 0ecc1e4f1..76c3076c9 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/docs
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/docs
@@ -1,2 +1,3 @@
-tderadio3/README
-tderadio3/TODO
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages b/ubuntu/_base/applications/multimedia/tderadio/debian/manpages
deleted file mode 100644
index 4760e939e..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tderadio.1
-debian/convert-presets.1
diff --git a/ubuntu/_base/common/cmake/debian/patches/series b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/common/cmake/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/rules b/ubuntu/_base/applications/multimedia/tderadio/debian/rules
index 4bef8d0a0..d8f798f1c 100755
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/rules
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/rules
@@ -1,142 +1,16 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-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)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
-	convert $< $@
-
-configure:
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
-	cp -f /usr/share/misc/config.sub admin/config.sub
-	cp -f /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \
-		--with-qt-includes=/usr/include/qt3 \
-		--with-qt-libraries=/usr/share/qt3/lib \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-rpath --disable-debug \
-		kde_htmldir=\$${prefix}/share/doc/tde/HTML
-															
-
-
-build: build-stamp debian/tderadio.xpm
-
-build-stamp:  config.status
-	dh_testdir
-	# Add here commands to compile the package.
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	rm -f debian/debiandirs 
-	rm -f debian/tderadio.xpm 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-#	[ ! -tderadio3/src && $(MAKE) clean
-	for i in `find | grep .gmo` ; do rm -f $$i ; done
-	find -name Makefile.in -delete
-	rm -f config.sub config.guess configure
-	rm -f acinclude.m4
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	# Add here commands to install the package into debian/tderadio.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-trinity
-	install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/share/pixmaps/tderadio.xpm
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so
-#	chrpath -d debian/tderadio/usr/bin/convert-presets
-#	chrpath -d debian/tderadio/usr/bin/tderadio
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs tderadio3/ChangeLog
-	dh_installdocs 
-	dh_installmenu
-	dh_installman
-	mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/multimedia/tderadio/debian/tderadio.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
deleted file mode 100644
index 2648970c2..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "Trinity Desktop Environment" "TDERadio"
-.SH NAME
-tderadio
-\- TDERadio
-.SH SYNOPSIS
-tderadio [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-TDERadio
-.SH OPTIONS
-.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 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:/tderadio/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tderadio/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Martin Witte <witte@kawo1.rwth-aachen.de>
-.br
-Marcus Camen <mcamen@mcamen.de>
-.br
-Klas Kalass <klas.kalass@gmx.de>
-.br
-
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/watch b/ubuntu/_base/applications/multimedia/tderadio/debian/watch
deleted file mode 100644
index 033fb78b0..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-version=2
-tderadio.sourceforge.net /download	tderadio-(.*)\.tar\.gz	debian	uupdate
diff --git a/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/basket/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/basket/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/basket/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/basket/debian/compat b/ubuntu/_base/applications/office/basket/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/basket/debian/compat
+++ b/ubuntu/_base/applications/office/basket/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control
index e7d6a2f72..05fc6bd80 100644
--- a/ubuntu/_base/applications/office/basket/debian/control
+++ b/ubuntu/_base/applications/office/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~)
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/ubuntu/_base/applications/office/basket/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/office/basket/debian/docs
+++ b/ubuntu/_base/applications/office/basket/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/office/basket/debian/rules b/ubuntu/_base/applications/office/basket/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/office/basket/debian/rules
+++ b/ubuntu/_base/applications/office/basket/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/compat b/ubuntu/_base/applications/office/kbibtex/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/compat
+++ b/ubuntu/_base/applications/office/kbibtex/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control
index b061836c4..377189f56 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/control
+++ b/ubuntu/_base/applications/office/kbibtex/debian/control
@@ -2,7 +2,7 @@ Source: kbibtex-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
 Standards-Version: 3.9.0
 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/docs
+++ b/ubuntu/_base/applications/office/kbibtex/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/rules b/ubuntu/_base/applications/office/kbibtex/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/office/kbibtex/debian/rules
+++ b/ubuntu/_base/applications/office/kbibtex/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/compat
+++ b/ubuntu/_base/applications/office/kbookreader/debian/compat
@@ -1,2 +1,2 @@
-9
+10
 
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control
index 85093a432..f0cd376d9 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/control
+++ b/ubuntu/_base/applications/office/kbookreader/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/docs b/ubuntu/_base/applications/office/kbookreader/debian/docs
index 7d96d4e7e..76c3076c9 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/docs
+++ b/ubuntu/_base/applications/office/kbookreader/debian/docs
@@ -1,2 +1,3 @@
 AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/rules b/ubuntu/_base/applications/office/kbookreader/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/office/kbookreader/debian/rules
+++ b/ubuntu/_base/applications/office/kbookreader/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/keximdb/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/keximdb/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/keximdb/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/keximdb/debian/compat b/ubuntu/_base/applications/office/keximdb/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/keximdb/debian/compat
+++ b/ubuntu/_base/applications/office/keximdb/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/keximdb/debian/control b/ubuntu/_base/applications/office/keximdb/debian/control
index f55077a26..1231f2f53 100644
--- a/ubuntu/_base/applications/office/keximdb/debian/control
+++ b/ubuntu/_base/applications/office/keximdb/debian/control
@@ -2,7 +2,7 @@ Source: keximdb-trinity
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Martin Ellis <martin.ellis@kdemail.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, koffice-trinity-dev, libglib2.0-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, koffice-trinity-dev, libglib2.0-dev
 Standards-Version: 3.7.2
 Section: tde
 
diff --git a/ubuntu/_base/applications/office/keximdb/debian/rules b/ubuntu/_base/applications/office/keximdb/debian/rules
index 72db8e489..e40e7d9dc 100755
--- a/ubuntu/_base/applications/office/keximdb/debian/rules
+++ b/ubuntu/_base/applications/office/keximdb/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/kile/debian/README.Debian b/ubuntu/_base/applications/office/kile/debian/README.Debian
deleted file mode 100644
index 5339affff..000000000
--- a/ubuntu/_base/applications/office/kile/debian/README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-kile for Debian
----------------
-
-Kile no longer comes with a Gnuplot front end. The Gnuplot front end that used
-to be part of Kile is now a separate application named Qgfe maintained by
-Pascal Brachet at http://www.xm1math.net/qgfe/ .
-
-Syntax files bibtex.xml and latex.xml are provided by tdelibs-data package.
-
- -- Ben Burton <bab@debian.org>, Sat, 23 Oct 2004 12:56:57 +1000
diff --git a/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/kile/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kile/debian/compat
+++ b/ubuntu/_base/applications/office/kile/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 7b699f3b0..2f79e32bc 100644
--- a/ubuntu/_base/applications/office/kile/debian/control
+++ b/ubuntu/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kile.sourceforge.net
 
diff --git a/ubuntu/_base/applications/office/kile/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs
index 724e08449..76c3076c9 100644
--- a/ubuntu/_base/applications/office/kile/debian/docs
+++ b/ubuntu/_base/applications/office/kile/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
index eb1b59da1..fdbee1056 100644
--- a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
+++ b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
@@ -6,3 +6,4 @@ opt/trinity/bin/kile
 /opt/trinity/share/doc/tde/HTML/en/kile
 /opt/trinity/share/icons
 /opt/trinity/share/mimelnk/text/x-kilepr.desktop
+/opt/trinity/share/man/man1/kile.1
diff --git a/ubuntu/_base/applications/office/kile/debian/kile.1 b/ubuntu/_base/applications/office/kile/debian/kile.1
deleted file mode 100644
index d7609722c..000000000
--- a/ubuntu/_base/applications/office/kile/debian/kile.1
+++ /dev/null
@@ -1,64 +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 KILE 1 "June 22, 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
-kile \- the TDE Integrated LaTeX Environment
-.SH SYNOPSIS
-.B kile [ \fIgeneric-options\fP ]
-[ \fB\-\-line\fP \fIline\fP ] [ \fB\-\-new\fP ]
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBKile\fP (the TDE Integrated LaTeX Environment) is a user-friendly
-LaTeX source editor and TeX shell for TDE.
-.PP
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-.PP
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-.PP
-Kile can support large projects consisting of several smaller files.
-.SH OPTIONS
-Below are the kile-specific options.
-For a full summary of options, run \fIkile \-\-help\fP.
-.TP
-\fB\-\-line\fP \fIline\fP
-Jump to the given line in the file that is opened.
-.TP
-\fB\-\-new\fP
-Start a new Kile main window.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kile/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kile/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can
-read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kile/\fP.
-.SH AUTHOR
-Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and
-Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from
-many others.
-.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/dependencies/dbus-tqt/debian/patches/series b/ubuntu/_base/applications/office/kile/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/patches/series
+++ b/ubuntu/_base/applications/office/kile/debian/patches/series
diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
index bd5478578..7328c1ce6 100755
--- a/ubuntu/_base/applications/office/kile/debian/rules
+++ b/ubuntu/_base/applications/office/kile/debian/rules
@@ -1,60 +1,38 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
-	-for language in `cd translations; ls -1d */`; do \
-		cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+-include /usr/share/cdbs/1/class/tde.mk
+
+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"
+
+common-install-indep::
+	# Install translations into individual packages
+	-for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+	done
+	-for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
 	done
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
 
 install/kile-trinity::
 	# Install pixmap
 	install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
 
-	chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
 clean::
 	rm -rf debian/kile-trinity-i18n-*
diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/ubuntu/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/README.source b/ubuntu/_base/applications/office/kmymoney/debian/README.source
deleted file mode 100644
index 2a0f24655..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
-
-Please note that /usr/share/doc/quilt/README.source is only available in quilt
-version 0.46-4.1 or later.
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/compat
+++ b/ubuntu/_base/applications/office/kmymoney/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
index 8693580ef..79e84b726 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/control
+++ b/ubuntu/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
 Standards-Version: 3.8.4
 
 Package: kmymoney2-trinity
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
 opt/trinity/lib/lib*.la
 opt/trinity/lib/lib*.so
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..85b95d21e 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
@@ -1 +1,3 @@
+AUTHORS
+README.md
 README.Fileformats
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules
index 0f794b445..3ba899106 100755
--- a/ubuntu/_base/applications/office/kmymoney/debian/rules
+++ b/ubuntu/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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 --with-extra-includes=/opt/trinity/include --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f po/*.gmo
+-include /usr/share/cdbs/1/class/tde.mk
+
+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" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/knowit/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/knowit/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/knowit/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/knowit/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/knowit/debian/compat
+++ b/ubuntu/_base/applications/office/knowit/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control
index 27d36e7ff..95b6bc7a6 100644
--- a/ubuntu/_base/applications/office/knowit/debian/control
+++ b/ubuntu/_base/applications/office/knowit/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knowit.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/office/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs
index 5502ed8f4..960f99591 100644
--- a/ubuntu/_base/applications/office/knowit/debian/docs
+++ b/ubuntu/_base/applications/office/knowit/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/knowit/debian/rules b/ubuntu/_base/applications/office/knowit/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/office/knowit/debian/rules
+++ b/ubuntu/_base/applications/office/knowit/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/compat b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/compat
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control
index 8f7bb1a23..d4a192d8d 100644
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/control
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control
@@ -2,397 +2,15 @@ Source: koffice-i18n-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
-Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 9~), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
 
-Package: koffice-i18n-bg-trinity
+Package: koffice-i18n-trinity
 Architecture: all
 Section: tde
-Recommends: tde-i18n-bg-trinity
+Recommends: tde-i18n-trinity
 Suggests: koffice-trinity
 Provides: koffice-i18n-trinity
-Description: Bulgarian (bg) translations for KOffice
- This package contains the Bulgarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ca-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ca-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Catalan (ca) translations for KOffice
- This package contains the Catalan translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cs-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cs-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Czech (cs) translations for KOffice
- This package contains the Czech translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cy-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cy-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Welsh (cy) translations for KOffice
- This package contains the Welsh translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-da-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-da-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Danish (da) translations for KOffice
- This package contains the Danish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-de-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-de-trinity
-Suggests: koffice-trinity, openthesaurus-de-kword
-Provides: koffice-i18n-trinity
-Description: German (de) translations for KOffice
- This package contains the German translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-el-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-el-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Greek (el) translations for KOffice
- This package contains the greek translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-engb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-engb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: British English (en_GB) translations for KOffice
- This package contains the British English (en_GB) translations
- for all applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-es-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-es-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Spanish (es) translations for KOffice
- This package contains the Spanish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-et-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-et-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Estonian (et) translations for KOffice
- This package contains the Estonian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-eu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-eu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Basque (eu) translations for KOffice
- This package contains the Basque translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fa-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fa-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Farsi (fa) translations for KOffice
- This package contains the Farsi translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fi-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fi-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Finnish (fi) translations for KOffice
- This package contains the Finnish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: French (fr) translations for KOffice
- This package contains the French translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ga-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ga-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Irish Gaelic (ga) translations for KOffice
- This package contains the Irish Gaelic translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-gl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-gl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Galician (gl) translations for KOffice
- This package contains the Galician translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-hu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-hu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Hungarian (hu) translations for KOffice
- This package contains the Hungarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-it-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-it-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Italian (it) translations for KOffice
- This package contains the Italian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ja-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ja-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Japanese (ja) translations for KOffice
- This package contains the Japanese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-km-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-km-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Khmer (km) translations for KOffice
- This package contains the Khmer translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-lv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-lv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latvian (lv) translations for KOffice
- This package contains the Latvian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ms-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ms-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Malay (ms) translations for KOffice
- This package contains the Malay translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-nb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Norwegian Bookmal (nb) translations for KOffice
- This package contains the Norwegian Bookmal translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nds-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nds-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Low Saxon (nds) translations for KOffice
- This package contains the Low Saxon translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ne-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ne-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Nepali (ne) translations for KOffice
- This package contains the Nepali translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Dutch (nl) translations for KOffice
- This package contains the Dutch translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Polish (pl) translations for KOffice
- This package contains the Polish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pt-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pt-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Portuguese (pt) translations for KOffice
- This package contains the Portuguese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ptbr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ptbr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Brazilian Portuguese (pt_BR) translations for KOffice
- This package contains the Brazilian Portuguese translations for all
- applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-ru-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ru-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Russian (ru) translations for KOffice
- This package contains the Russian translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovak (sk) translations for KOffice
- This package contains the Slovak translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovenian (sl) translations for KOffice
- This package contains the Slovenian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Serbian (sr) translations for KOffice
- This package contains the Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-srlatin-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-srlatin-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latin Serbian (sr@Latn) translations for KOffice
- This package contains the Latin Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Swedish (sv) translations for KOffice
- This package contains the Swedish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-tr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-tr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Turkish (tr) translations for KOffice
- This package contains the Turkish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-uk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-uk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Ukrainian (uk) translations for KOffice
- This package contains the Ukrainian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-zhcn-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhcn-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Simplified (zh_CN) translations for KOffice
- This package contains the Chinese Simplified translations for all
- applications in the Trinity Office Suite.
-
-Package: koffice-i18n-zhtw-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhtw-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Traditional (zh_TW) translations for KOffice
- This package contains the Chinese Traditional translations for all
- applications in the Trinity Office Suite.
+Description: All languages (all) internationalized (i18n) files for KOffice
+ This package contains the All languages (all) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang
new file mode 100644
index 000000000..f75b7d747
--- /dev/null
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang
@@ -0,0 +1,10 @@
+
+Package: koffice-i18n-@pkg_lang@-trinity
+Architecture: all
+Section: tde
+Recommends: tde-i18n-@pkg_lang@-trinity
+Suggests: koffice-trinity
+Provides: koffice-i18n-trinity
+Description: @lang_desc@ (@lang@) internationalized (i18n) files for KOffice
+ This package contains the @lang_desc@ (@lang@) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-source b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source
new file mode 100644
index 000000000..c1a3a089b
--- /dev/null
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source
@@ -0,0 +1,6 @@
+Source: koffice-i18n-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/rules b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
index 8fb58ece9..2a292557e 100755
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/rules
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
@@ -3,11 +3,36 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+I18N_DIR_PREFIX := koffice-i18n
+I18N_DEST_PREFIX := $(I18N_DIR_PREFIX)
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
+
+# Stamps and support variables
+cur_lang = $(word 2,$(subst __, ,$@))
+cur_lang_target = $(subst @,_,$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
+cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]'))))
+cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity
+
+STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
+I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
+I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS))
+
+DEB_BUILD_PARALLEL ?= true
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
 
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+
 # The default gzip compressor has been changed in dpkg >= 1.17.0.
 deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
                          sed -e "s|.*version ||" -e "s| .*||" | \
@@ -18,91 +43,124 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-languages = `ls -1d *i18n*`
+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_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON"
+
 
-build-stamp:
+build::
 	dh_testdir
+	dh_prep
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+build:: debian/stamp__build
+
+debian/stamp__build:
+	[ -d build ] || \
+	mkdir build
+	cd build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
+
+else
+
+build:: $(STAMP_BUILD)
+
+$(STAMP_BUILD):
+	# Building the '$(cur_lang)' language ...
+	[ -d $(cur_lang_dir)/build ] || \
+	mkdir $(cur_lang_dir)/build
+	[ -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
+	cd $(cur_lang_dir)/build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
 
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+
+install::
+	dh_testdir
+	dh_testroot
+
+install:: $(I18N_INSTALL)
+	dh_testdir
+	cat debian/control-source > debian/control
+	find debian -name "control-lang-*" | LANG=C sort | xargs -r cat >> debian/control
+
+$(I18N_INSTALL): build
+ifneq "$(wildcard /usr/bin/ninja)" ""
+	[ ! -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) -C build install-$(cur_lang_target)
+else
+	cd $(cur_lang_dir)/build && \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL)
 endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	#Configure languages.
-	-for i in $(languages); do \
-	  cd  $$i && \
-	  autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \
-	  ./configure $(configkde); \
-	  $(MAKE) $(DEB_MAKE_PARALLEL); \
-	  cd ..; \
-	done
-
-	touch build-stamp
-
-build: build-stamp
--include debian/debiandirs
-
-clean: 
-	dh_clean
+	sed -e "s|@lang@|$(cur_lang)|g" \
+	    -e "s|@pkg_lang@|$(cur_pkg_lang)|g" \
+	    -e "s|@lang_desc@|$$(sed -n '/^\[$(cur_lang)\]/,/^\[/s#^Name=##p' /opt/trinity/share/locale/all_languages)|" \
+	    < debian/control-lang > debian/control-lang-$(cur_pkg_lang); \
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+clean: debian-clean
+
+else
+
+clean: $(I18N_CLEAN) debian-clean
+
+$(I18N_CLEAN):
 	dh_testdir
-	
-	# Remove all language directories.
-	rm -rf build-stamp 
-	rm -rf debian/*18n*
+	rm -rf $(cur_lang_dir)/build
+
+endif
 
-binary-indep: build
+debian-clean:
 	dh_testdir
+	rm -rf build
+	rm -rf debian/$(I18N_DEST_PREFIX)-*
+	rm -f debian/stamp__*
+	rm -f debian/control-lang-*
+	cat debian/control-source > debian/control
+	sed -e "s|@lang@|all|g" \
+	    -e "s|-@pkg_lang@||g" \
+	    -e "s|@lang_desc@|All languages|" \
+	    < debian/control-lang >> debian/control
+	dh_clean
+
+
+binary-arch: build
 	dh_testroot
-	dh_clean -k
-	
-	-for i in $(languages); do \
-	  ( \
-	   cd $$i && \
-	   echo $$(install_dir) && \
-	   $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \
-	   cd .. \
-	  ) \
-	done
-	
-
-	mkdir debian/koffice-i18n-engb-trinity
-	cp -aR debian/koffice-i18n-en_GB-trinity/* debian/koffice-i18n-engb-trinity/
-	
-	mkdir debian/koffice-i18n-ptbr-trinity
-	cp -aR debian/koffice-i18n-pt_BR-trinity/* debian/koffice-i18n-ptbr-trinity/
-	
-	mkdir debian/koffice-i18n-srlatin-trinity
-	cp -aR debian/koffice-i18n-sr@Latn-trinity/* debian/koffice-i18n-srlatin-trinity/
-	
-	mkdir debian/koffice-i18n-zhcn-trinity
-	cp -aR debian/koffice-i18n-zh_CN-trinity/* debian/koffice-i18n-zhcn-trinity/
-
-	mkdir debian/koffice-i18n-zhtw-trinity
-	cp -aR debian/koffice-i18n-zh_TW-trinity/* debian/koffice-i18n-zhtw-trinity/
-	
-
-	#Removing duplicate kdgantt.mo files.
-	-rm -f `find . -name "kdgantt.mo"`
+	dh_testdir
 
+
+binary-indep: build install
+	dh_testroot
+	dh_testdir
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
-	dh_strip
 	dh_link
+	dh_strip
+	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
+	dh_strip_nondeterminism)
 	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
 	dh_fixperms
 	dh_installdeb
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
-binary:	binary-indep 
 
-.PHONY: binary binary-indep clean
+# Below here is fairly generic really
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean build install $(I18N_INSTALL)
diff --git a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/koffice/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/compat
+++ b/ubuntu/_base/applications/office/koffice/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control
index d22475ffb..c3171624c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/control
+++ b/ubuntu/_base/applications/office/koffice/debian/control
@@ -4,8 +4,8 @@ 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>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 9~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-all-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
-Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
+Build-Depends: tde-cdbs (>= 0.4.52ubuntu18), debhelper (>= 10~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python3-all-dev, dh-python, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends-Indep: graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
 
@@ -303,7 +303,7 @@ Section: libs
 Replaces: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
 Breaks: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~)
-Recommends: latex-xft-fonts, ruby, python-all
+Recommends: latex-xft-fonts, ruby, python3-all
 Suggests: wordnet, texlive-base
 Description: common libraries and binaries for the Trinity Office Suite [Trinity]
  This package provides the libraries and binaries that are shared amongst
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
index a03e53a02..8b0b8b25c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
@@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz
+debian/tmp/opt/trinity/share/man/man1/karbon.1
 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop
 debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop
 debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
deleted file mode 100644
index 8a212a2b2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/karbon.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1
deleted file mode 100644
index 6a4cbb8ef..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon.1
+++ /dev/null
@@ -1,44 +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 KARBON 1 "May 9, 2003"
-.\" 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
-karbon \- a vector graphics application for the Trinity Office Suite
-.SH SYNOPSIS
-.B karbon
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKarbon\fP is a vector graphics application.
-.PP
-Note that the Trinity Office Suite comes with two graphics applications \-
-Kontour (which is vector-based) and Chalk (which is raster-based).
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the karbon-specific options.
-For a full summary of options, run \fIkarbon \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH AUTHOR
-Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling
-<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and
-Benoit Vautrin <benoit.vautrin@free.fr>.
-.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/applications/office/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
index c5d3596c2..a6a595a2b 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
+debian/tmp/opt/trinity/share/man/man1/kchart.1
 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
deleted file mode 100644
index 38c864763..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kchart.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1
deleted file mode 100644
index 367f2e7ab..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart.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 KCHART 1 "May 9, 2003"
-.\" 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
-kchart \- a chart drawing program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kchart
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKChart\fP is a chart drawing application.  It can be used to embed charts
-into KOffice documents.  KChart is easy to use and highly configurable.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kchart-specific options.
-For a full summary of options, run \fIkchart \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kchart/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kchart/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
-.SH AUTHOR
-KChart was written by Kalle Dalheimer <kalle@kde.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
-Reginald Stadlbauer <reggie@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/applications/office/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
index c97a73fa5..c73fd674a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png
+debian/tmp/opt/trinity/share/man/man1/kformula.1
 debian/tmp/opt/trinity/share/services/kformulapart.desktop
 debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
index 25a8c006f..806f0020c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,2 @@
 kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
 kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
deleted file mode 100644
index 35c78eaa9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kformula.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1
deleted file mode 100644
index ebbd55afb..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula.1
+++ /dev/null
@@ -1,75 +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 KFORMULA 1 "May 9, 2003"
-.\" 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
-kformula \- a formula editor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kformula
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKFormula\fP is an easy to use formula editor. It provides the basic
-input facilities and the support functionality you come to expect of a
-KOffice application. But there is more. Some of its most exciting
-features are:
-.PP
-.RS
-Easy Greek letter insertion
-.PP
-Intelligent cursor movement
-.PP
-Advanced syntax highlighting
-.PP
-Multi-level undo support
-.PP
-LaTeX export (copy and paste into a text editor)
-.RE
-.PP
-KFormula uses the KOffice formula drawing library. If you have to deal
-with many formulae you may wish to use a KFormula object embedded in
-KWord or KSpread.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kformula-specific options.
-For a full summary of options, run \fIkformula \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kword (1),
-.BR kspread (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kformula/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kformula/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
-.SH AUTHOR
-KFormula was written by Andrea Rizzi <rizzi@kde.org>,
-Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
-Heinrich Kuettler <heinrich.kuettler@gmx.de> and
-Claus O. Wilke <wilke@caltech.edu>.
-.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/applications/office/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
index 289580d09..b1fa9d81d 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
@@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
 debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
+debian/tmp/opt/trinity/share/man/man1/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
deleted file mode 100644
index 1f348c0ca..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1
deleted file mode 100644
index b6557f54f..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio.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 KIVIO 1 "May 9, 2003"
-.\" 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
-kivio \- a flowcharting program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kivio
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKivio\fP is a flowcharting program that offers basic flowcharting
-abilities, but with a twist.  Objects are scriptable, and a backend plugin
-system offers the ability to make objects do just about anything.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kivio-specific options.
-For a full summary of options, run \fIkivio \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Some documentation from the program author
-is available in \fI/usr/share/doc/kivio/\fP.
-.SH AUTHOR
-Kivio was written by Dave Marotti <lndshark@speakeasy.net>,
-Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>,
-Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>,
-Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>.
-.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/applications/office/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
deleted file mode 100644
index 07529ada9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koconverter.1
+++ /dev/null
@@ -1,58 +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 KOCONVERTER 1 "May 9, 2003"
-.\" 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
-koconverter \- convert between office suite file formats
-.SH SYNOPSIS
-.B koconverter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-mimetype\fP \fImime\fP ]
-\fIinput\fP \fIoutput\fP
-.SH DESCRIPTION
-\fBKOConverter\fP is the KOffice file format converter.  It uses the
-KOffice import and export filters to convert from any file format
-that is understood by KOffice to any other.
-.PP
-This tool is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koconverter-specific options.  For a full summary of options,
-run \fIkoconverter \-\-help\fP.
-.TP
-\fB\-\-mimetype\fP \fImime\fP
-Use \fImime\fP as the mime type for the output file.  This option should be
-used when the desired type of output file cannot be determined from its
-name alone.
-.SH EXAMPLES
-The following line will convert an Excel spreadsheet to a native KSpread
-file.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.ksp
-.RE
-.PP
-The following line will convert an Excel spreadsheet to a plain text
-file.  Note that this conversion is done internally by first importing
-to a KSpread spreadsheet and then exporting as plain text.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.txt
-.RE
-.SH AUTHOR
-KOConverter was written by David Faure <faure@kde.org>.
-.br
-This manual page was written by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..317098e2f 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
@@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.*
 debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.*
 debian/tmp/opt/trinity/lib/libkwmf.so.*
 debian/tmp/opt/trinity/lib/libkwordexportfilters.so.*
+debian/tmp/opt/trinity/share/man/man1/koconverter.1
+debian/tmp/opt/trinity/share/man/man1/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
deleted file mode 100644
index 52c63b5d7..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/koconverter.1
-debian/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1
deleted file mode 100644
index 419c52df0..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koscript.1
+++ /dev/null
@@ -1,39 +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 KOSCRIPT 1 "May 9, 2003"
-.\" 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
-koscript \- a script interpreter for the Trinity Office Suite
-.SH SYNOPSIS
-.B koscript
-[ \fIgeneric-options\fP ]
-\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ]
-.SH DESCRIPTION
-\fBKOScript\fP is the KOffice script interpreter.  It is used to run the
-given KOffice script.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koscript-specific options.  For a full summary of options,
-run \fIkoscript \-\-help\fP.
-.TP
-\fB\-\-\fP \fIscript-options\fP
-Pass \fIscript-options\fP as options to the script.
-.SH AUTHOR
-KOScript was written by Torben Weis <weis@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/applications/office/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
index 4b63bd352..dd3561570 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
@@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz
+debian/tmp/opt/trinity/share/man/man1/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
index c77411ba2..888cebb0a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,2 @@
 koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
 koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
deleted file mode 100644
index fc332a5cc..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1
deleted file mode 100644
index d1dc76870..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell.1
+++ /dev/null
@@ -1,36 +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 KOSHELL 1 "May 9, 2003"
-.\" 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
-koshell \- the Trinity Office Suite workspace
-.SH SYNOPSIS
-.B koshell
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
-launchers for KOffice applications.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkoshell \-\-help\fP.
-.SH AUTHOR
-KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann
-<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken
-<sven@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/applications/office/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 74f77679d..4e0bf33b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,2 @@
 kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
 kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
deleted file mode 100644
index 635cc9556..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
+++ /dev/null
@@ -1,45 +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 KPRCONVERTER.PL 1 "May 9, 2003"
-.\" 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
-kprconverter.pl \- converts a KPresenter document from old to new format
-.SH SYNOPSIS
-.B kprconverter.pl
-.I old-XML new-XML
-.SH DESCRIPTION
-This Perl script converts the XML data within a KPresenter document from the
-old format (v1) to the new format (v2), which is necessary due to the new
-text object.  It reads the old XML data from \fIold-XML\fP and writes new
-converted XML data to \fInew-XML\fP.
-.PP
-The XML data stored in a KPresenter document can be accessed by passing
-the \fB.kpr\fP document through gunzip.
-.PP
-This utility is part of the Trinity Office Suite.
-.SH NOTES
-Be aware that \fIold-XML\fP should not be the
-original \fB.kpr\fP document, but should
-instead be just the extracted XML data.
-.PP
-This script is automatically called by KPresenter when an old format
-document is opened.  Ordinary users should not need to run this script
-themselves.
-.SH SEE ALSO
-.BR kpresenter (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/applications/office/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
index 5aada1cab..44d61cc4c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
@@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kpresenter.1
+debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
deleted file mode 100644
index 3357e6954..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kpresenter.1
-debian/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
deleted file mode 100644
index 08eddd41e..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
+++ /dev/null
@@ -1,56 +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 KPRESENTER 1 "May 9, 2003"
-.\" 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
-kpresenter \- a presentation program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kpresenter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKPresenter\fP is a fully-featured presentation program.  Presentations can
-be edited directly within KPresenter, and many advanced features for
-screen presentations are available.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kpresenter-specific options.
-For a full summary of options, run \fIkpresenter \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kpresenter/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kpresenter/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
-.SH AUTHOR
-KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
-Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
-Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>,
-Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and
-Ariya Hidayat <ariya@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/applications/office/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
index ee708351b..915f71c19 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
@@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png
+debian/tmp/opt/trinity/share/man/man1/kspread.1
 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
deleted file mode 100644
index 833228aec..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kspread.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1
deleted file mode 100644
index 0cf7e8861..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread.1
+++ /dev/null
@@ -1,55 +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 KSPREAD 1 "May 9, 2003"
-.\" 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
-kspread \- a spreadsheet for the Trinity Office Suite
-.SH SYNOPSIS
-.B kspread
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKSpread\fP is a powerful spreadsheet application.  It is scriptable and
-provides both table-oriented sheets and support for complex mathematical
-formulae and statistics.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kspread-specific options.
-For a full summary of options, run \fIkspread \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kspread/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kspread/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
-.SH AUTHOR
-KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
-<montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
-.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/applications/office/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..4fb9550bd 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
@@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/man/man1/kthesaurus.1
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index 252102b05..5f43c4233 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,3 @@
 kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
 kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
 
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
deleted file mode 100644
index 4fb6feb79..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kthesaurus.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
deleted file mode 100644
index 32f929bb8..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.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 KTHESAURUS 1 "May 9, 2003"
-.\" 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
-kthesaurus \- a thesaurus for the Trinity Office Suite
-.SH SYNOPSIS
-.B kthesaurus
-[ \fIgeneric-options\fP ] [ \fIterm\fP ]
-.SH DESCRIPTION
-\fBKThesaurus\fP is a thesaurus tool.  It lists words related to a search
-term and offers a user interface to WordNet, an online lexical reference
-system.
-.PP
-Only the English language is supported.
-.PP
-A term to search for may be optionally specified on the command-line.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkthesaurus \-\-help\fP.
-.SH SEE ALSO
-.BR kword (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/thesaurus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/thesaurus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
-.SH AUTHOR
-KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
-.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/applications/office/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
deleted file mode 100644
index bb08bb355..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
+++ /dev/null
@@ -1,61 +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 KUDESIGNER 1 "May 9, 2003"
-.\" 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
-kudesigner \- a report template designer for Kugar
-.SH SYNOPSIS
-.B kudesigner
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKuDesigner\fP is a tool for creating report templates to use with
-Kugar, the business report maker for KOffice.  Templates (which describe
-the layout of the data within a report) can be created in a visual
-drag-and-drop manner and then saved to file.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kudesigner-specific options.
-For a full summary of options, run \fIkudesigner \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kugar (1).
-.PP
-Full user documentation for Kugar is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
-Joseph Wenninger <jowenn@jowenn.at>.
-.br
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.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/applications/office/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
index 0cda2bece..b1b014203 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
@@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png
+debian/tmp/opt/trinity/share/man/man1/kugar.1
+debian/tmp/opt/trinity/share/man/man1/kudesigner.1
 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop
 debian/tmp/opt/trinity/share/services/kugarpart.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
deleted file mode 100644
index 2a72a7d1b..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kugar.1
-debian/kudesigner.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1
deleted file mode 100644
index 134747aa2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar.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 KUGAR 1 "May 9, 2003"
-.\" 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
-kugar \- a business report maker for the Trinity Office Suite
-.SH SYNOPSIS
-.B kugar
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIxml-data-file\fP ... ]
-.SH DESCRIPTION
-\fBKugar\fP is a tool for generating business quality reports that can
-be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any TDE application can
-embed the report viewing functionality and that reports can be viewed
-using the Konqueror browser.
-.PP
-Kugar will create a report for the data stored in the data file
-\fIxml-data-file\fP.  Data files typically end in \fB.kud\fP.
-Note that simply clicking on a data file in Konqueror will cause Kugar
-to create a report.
-.PP
-The data will be displayed according to the layout described in a template
-file.  This template file is generally named in the data file.
-Template files typically end in \fB.kut\fP.  See
-.BR kudesigner (1)
-for a tool for creating template files.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kugar-specific options.
-For a full summary of options, run \fIkugar \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kudesigner (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.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/applications/office/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
index dfeb77b97..29ea06866 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
@@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
deleted file mode 100644
index a9bf36729..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1
deleted file mode 100644
index e55e7f5f3..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword.1
+++ /dev/null
@@ -1,60 +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 KWORD 1 "May 9, 2003"
-.\" 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
-kword \- a word processor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kword
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKWord\fP is a FrameMaker-like word processing and desktop publishing
-application.  KWord is capable of creating demanding and professional
-looking documents.  It can be used for desktop publishing, but also for
-"normal" word processing, like writing letters, reports and so on.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kword-specific options.
-For a full summary of options, run \fIkword \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1),
-.BR kthesaurus (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kword/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kword/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kword/\fP.
-.SH AUTHOR
-KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
-<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
-<zander@kde.org>, Shaheed Haque <srhaque@iee.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org>
-and many others.
-.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/applications/office/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules
index 397783a27..6abc7fbcf 100755
--- a/ubuntu/_base/applications/office/koffice/debian/rules
+++ b/ubuntu/_base/applications/office/koffice/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
@@ -27,7 +27,7 @@ DEB_INSTALL_CHANGELOGS_kugar-trinity := kugar/CHANGES
 DEB_INSTALL_CHANGELOGS_kword-trinity := kword/CHANGES
 DEB_INSTALL_CHANGELOGS_koffice-libs-trinity := lib/CHANGES
 
-DEB_COMPRESS_EXCLUDE := .ksp .kwd .kwt .docbook
+DEB_COMPRESS_EXCLUDE_ALL += .ksp .kwd .kwt .docbook
 
 install/chalk-data-trinity::
 	install -m 755 -d debian/chalk-data-trinity/opt/trinity/share/apps/chalk/profiles/
diff --git a/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/kpilot/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kpilot/debian/compat
+++ b/ubuntu/_base/applications/office/kpilot/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control
index e598f518b..6e7612f31 100644
--- a/ubuntu/_base/applications/office/kpilot/debian/control
+++ b/ubuntu/_base/applications/office/kpilot/debian/control
@@ -2,7 +2,7 @@ Source: kpilot-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/applications/office/kpilot/debian/docs b/ubuntu/_base/applications/office/kpilot/debian/docs
new file mode 100644
index 000000000..960f99591
--- /dev/null
+++ b/ubuntu/_base/applications/office/kpilot/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/office/kpilot/debian/rules b/ubuntu/_base/applications/office/kpilot/debian/rules
index f8596e545..a40072965 100755
--- a/ubuntu/_base/applications/office/kpilot/debian/rules
+++ b/ubuntu/_base/applications/office/kpilot/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source b/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source
new file mode 100644
index 000000000..dd31d8dd1
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source
@@ -0,0 +1,9 @@
+This Debian package for tde-ebook-reader does not contain some of the original
+FBReader hyphenation patterns due to following license problems:
+
+el.pattern: no license
+fi.pattern: modification is not explicitly allowed
+tr.pattern: no license
+
+These files were removed from zlibrary/text/data/hyphenationPatterns.zip.
+
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog b/ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog
new file mode 100644
index 000000000..323f5d530
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog
@@ -0,0 +1,765 @@
+tde-ebook-reader (0.99.6-debian) testing; urgency=low
+
+  * Ported to TQt3 and package renaming
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 11 May 2024 23:04:00 +0900
+
+fbreader (0.99.4+dfsg-6) unstable; urgency=medium
+
+  * QA upload.
+
+  * Added d/gbp.conf to describe branch layout.
+  * Updated vcs in d/control to Salsa.
+  * Updated d/gbp.conf to enforce the use of pristine-tar.
+  * Updated Standards-Version from 4.2.1 to 4.7.0.
+  * Use wrap-and-sort -at for debian control files
+  * Replaced obsolete pkg-config build dependency with pkgconf.
+  * Corrected shared library SO version in lintian overrides.
+  * Added 1014-desktop-mime-type.patch to announce MIME type support in
+    XDG desktop (Closes: #601609, #601605, #813768).
+  * Bump debhelper from deprecated 9 to 12 and use debhelper-compat version
+    in Build-Depends.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri, 10 May 2024 13:19:06 +0200
+
+fbreader (0.99.4+dfsg-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org>  Thu, 29 Feb 2024 02:32:43 +0000
+
+fbreader (0.99.4+dfsg-5) unstable; urgency=medium
+
+  * QA upload.
+  * Prevent installing .so link in non-dev library pkgs.
+  * Fix Breaks/Replaces.
+  * Drop old NEWS.
+  * Drop non-functional debian/watch.
+
+ -- Bastian Germann <bage@debian.org>  Thu, 07 Sep 2023 15:41:50 +0000
+
+fbreader (0.99.4+dfsg-4) unstable; urgency=medium
+
+  * QA upload.
+  * Install liblzui in fbreader.
+
+ -- Bastian Germann <bage@debian.org>  Tue, 05 Sep 2023 10:24:23 +0000
+
+fbreader (0.99.4+dfsg-3) unstable; urgency=medium
+
+  * QA upload.
+  * Prevent the same files in two different packages.
+  * Drop libzlui-qt and itegrate its contents into fbreader.
+
+ -- Bastian Germann <bage@debian.org>  Tue, 05 Sep 2023 00:39:53 +0200
+
+fbreader (0.99.4+dfsg-2) experimental; urgency=medium
+
+  * QA upload.
+  * fbreader: Fix Depends on libzlui-qt instead of dropped -qt4.
+
+ -- Bastian Germann <bage@debian.org>  Mon, 04 Sep 2023 20:05:08 +0200
+
+fbreader (0.99.4+dfsg-1) experimental; urgency=medium
+
+  * QA upload.
+  * Drop unneeded quilt Build-Dependency.
+  * Update to new upstream version. (Closes: #765039)
+  * Build with Qt5 patch. (Closes: #967336)
+
+ -- Bastian Germann <bage@debian.org>  Sat, 02 Sep 2023 11:40:44 +0000
+
+fbreader (0.12.10dfsg2-6) unstable; urgency=low
+
+  * QA upload.
+  * Fix FTBFS with GCC-11 (Closes: #984121)
+    - Add debian/patches/0014-fix-ftbfs-gcc11.patch
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Wed, 12 Jan 2022 23:06:22 +0800
+
+fbreader (0.12.10dfsg2-5) unstable; urgency=medium
+
+  * QA upload.
+  * Orphan package.
+  * debian/source/format: Convert to "3.0 (quilt)" source package.
+  * debian/control: Replace transitional package ttf-unifont with
+    fonts-unifont.
+
+ -- Boyuan Yang <byang@debian.org>  Thu, 26 Aug 2021 23:14:08 -0400
+
+fbreader (0.12.10dfsg2-4) unstable; urgency=medium
+
+  * debian/control:
+    - Drop Qt4 UI (libzlui-qt4), as Qt4 is going away. (Closes: #874867)
+  * debian/patches:
+    - New patch 0013-fbreader-Makefile-make-linking-order-reproducible, by
+      Chris Lamb. (Closes: 861770)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 01 Sep 2019 10:59:46 +0200
+
+fbreader (0.12.10dfsg2-3) unstable; urgency=medium
+
+  * debian/patches:
+    - New patch 0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.
+      Fixes building with curl 7.62.0. Thanks to Adrian Bunk for the report
+      and the libcurl API change hint. (Closes: #913382)
+    - New patch 0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa by
+      Helmut Grohne.
+  * debian/rules:
+    - Enable cross-architecture building. Patch by Helmut Grohne.
+      (Closes: #861422)
+  * debian/control:
+    - Updated Standards-Version to 4.2.1, no changes needed.
+    - Added Recommends on sensible-utils (as suggested by lintian).
+  * debian/source/format:
+    - Created (with '1.0' inside).
+  * debian/libzlcore-data.lintian-overrides:
+    - Removed a false positive override introduced in 0.12.10dfsg2-1,
+      apparently fixed in lintian since.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 09 Dec 2018 18:21:31 +0100
+
+fbreader (0.12.10dfsg2-2) unstable; urgency=medium
+
+  * debian/patches:
+    - New patch booksdb-avoid-converting-boolean-to-shared_ptr.patch. Fixes
+      building with GCC6. Patch by Robert Bihlmeyer. (Closes: #811676)
+  * debian/copyright:
+    - Updated my e-mail address.
+    - Removed obsolete statements for DocBook/XHTML entity files removed in
+      the previous upload. (Closes: #824393)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 24 Jul 2016 13:40:32 +0200
+
+fbreader (0.12.10dfsg2-1) unstable; urgency=medium
+
+  * debian/dfsg-repack:
+    - Also remove docbook- and XHTML entity files. (Closes: #807074)
+  * debian/patches:
+    - New patch fbreader-Makefile-do-not-try-to-install-empty-format.patch, so
+      upstream Makefile doesn't install unexisting XHTML entity files.
+  * debian/control:
+    - Updated Standards-Version to 3.9.6, no changes needed.
+    - Bumped debhelper build-dependency to >= 9.
+  * debian/rules:
+    - Modernized using dh overrides.
+  * debian/menu:
+    - Removed as suggested by lintian, since a .desktop-file is present.
+  * debian/libzlcore-data.lintian-overrides:
+    - Added to override a false positive about reproducibility of
+      usr/share/zlibrary/unicode.xml.gz.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 21 Feb 2016 10:46:49 +0100
+
+fbreader (0.12.10dfsg-10) unstable; urgency=low
+
+  * NMU acknowledged - thanks, Ondřej!
+  * debian/control:
+    - Bump ABI parts of libzlcore and libzltext package names for GCC5 C++11
+      ABI transition. For historical reasons these package name parts were
+      actually a bit off the SONAMEs, and now it's a good time to fix it.
+      (Closes: #763468)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Tue, 21 Jul 2015 20:52:34 +0300
+
+fbreader (0.12.10dfsg-9.1) unstable; urgency=medium
+
+  * Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 29 Sep 2014 14:04:47 +0200
+
+fbreader (0.12.10dfsg-9) unstable; urgency=low
+
+  * debian/control:
+    - Bumped Standards-Version to 3.9.4, no changes needed.
+    - Build-depend on libunibreak-dev instead of liblinebreak2-dev.
+  * debian/patches:
+    - New patch 950-link-to-libunibreak.patch.
+    - New patch 951-fix-calling-compiler.patch, which replaces old
+      940-use-debian-compiler-flags.patch: reworked to not override compiler
+      flags by "target setup" instead of introducing DEBFLAGS, force verbose
+      compilation and introduce CPPFLAGS and CXXFLAGS where needed.
+  * debian/rules:
+    - Include dpkg's buildflags.mk if present to support hardening.
+    - Removed DEBFLAGS-hack.
+    - Removed obsolete commented Qt3-related line.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Fri, 21 Jun 2013 13:17:00 +0300
+
+fbreader (0.12.10dfsg-8) unstable; urgency=low
+
+  * debian/patches:
+    - New patch 600-fix-ftell-crash.patch, fixing a possible crash on
+      migration. (Closes: #689338)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sat, 06 Oct 2012 12:33:58 +0300
+
+fbreader (0.12.10dfsg-7) unstable; urgency=medium
+
+  * debian/rules:
+    - Fixed FTFBS on binary-only builds. Report by Pino Toscano, patch by
+      Salvatore Bonaccorso. (Closes: #680657)
+  * debian/control:
+    - Bumped Standards-Version to 3.9.3, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 08 Jul 2012 12:05:01 +0300
+
+fbreader (0.12.10dfsg-6) unstable; urgency=medium
+
+  * debian/patches:
+    - New patch 910-zlui-qt4-links-to-QtCore.patch. Thanks to Stepan Golosunov
+      for the report. (Closes: #649612)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sat, 26 Nov 2011 12:35:23 +0200
+
+fbreader (0.12.10dfsg-5) unstable; urgency=low
+
+  * debian/{control,rules}
+    - Don't build zlui-maemo anymore as its build-depends will be removed from
+      Debian repositories. (Closes: #643745)
+  * debian/patches:
+    - Dropped maemo-specific patches as not needed anymore.
+  * debian/NEWS:
+    - Set the version of really uploaded package.
+      Fixes a lintian warning 'debian-news-entry-has-unknown-version'.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Thu, 29 Sep 2011 19:25:10 +0300
+
+fbreader (0.12.10dfsg-4) unstable; urgency=low
+
+  * debian/control:
+    - Build-depend on liblinebreak{ -> 2}-dev.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Tue, 14 Jun 2011 19:38:15 +0300
+
+fbreader (0.12.10dfsg-3) unstable; urgency=medium
+
+  * debian/patches:
+    - New patch 030-use-pkgconfig-includes.patch from Steve Langasek.
+      (Closes: #620852)
+    - New patch 400-fix-building-with-gcc46.patch. Fixes FTBFS.
+      (Closes: #618051)
+  * debian/control:
+    - Bumped Standards-Version to 3.9.2, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sat, 28 May 2011 14:01:16 +0300
+
+fbreader (0.12.10dfsg-2) unstable; urgency=low
+
+  * Upload to unstable. (Closes: #613902)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sat, 19 Feb 2011 14:15:35 +0200
+
+fbreader (0.12.10dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Added libjpeg8-dev build-dependency. (Closes: #598996)
+    - Bumped Standards-Version to 3.9.1, no changes needed.
+    - Reintroduced libzlui-maemo binary package and build dependencies.
+  * debian/rules:
+    - Reintroduced maemo actions.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Mon, 04 Oct 2010 19:47:39 +0300
+
+fbreader (0.12.9dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/NEWS:
+    - Added with notes about migration to 0.12.
+  * debian/control:
+    - Updated my mail address.
+    - Removed DMUA, it is not needed anymore.
+    - Added eReader to the list of supported formats.
+    - Temporarily removed libzlui-maemo binary package and build dependencies
+      for it until maemo support is ready.
+    - Dropped 'libzlui-qt' binary package.
+    - Bumped Standards-Version to 3.8.4, no changes needed.
+    - Changed the suffix of library packages from 0.10 to 0.12.
+    - Set minimum build-dependency libcurl version to 7.17 as per upstream
+      README.build.
+    - Added libsqlite3-dev build-dependency.
+  * debian/copyright:
+    - Updated copyright years.
+  * debian/patches:
+    - 930-use-shell-make-variable.patch: updated.
+    - 020-maemo-disable-libconic.patch: refreshed.
+    - 900-delete-useless-strip-flag.patch: refreshed.
+    - 930-use-shell-make-variable.patch: refreshed.
+    - 940-use-debian-compiler-flags.patch: refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Thu, 25 Mar 2010 19:58:30 +0200
+
+fbreader (0.10.7dfsg-4) unstable; urgency=medium
+
+  * debian/control:
+    - Use source:Version for dependencies on arch-independent packages.
+      Thanks to Julien Cristau for the report. Fixes FTBFS on BinNMUs.
+      (Closes: #596575)
+    - Updated my mail address.
+    - Removed DM-Upload-Allowed, not needed anymore.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sun, 12 Sep 2010 21:23:29 +0300
+
+fbreader (0.10.7dfsg-3) unstable; urgency=low
+
+  * debian/control:
+    - Don't allow libzlui front-ends from previous series to be co-installed
+      with modern fbreader to prevent crashes. (Closes: #544138)
+    - Bumped Standards-Version to 3.8.3, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sun, 30 Aug 2009 14:23:49 +0300
+
+fbreader (0.10.7dfsg-2) unstable; urgency=low
+
+  * debian/control:
+    - Fixed misspelled choice 'libzlui-qt' (Qt3 UI) in Depends.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Tue, 19 May 2009 11:21:39 +0300
+
+fbreader (0.10.7dfsg-1) unstable; urgency=low
+
+  * New upstream release, some changes:
+    - 0.10.7:
+      - A conflict between hyperlink clicks and touch scrolling has
+        been fixed.
+      - In maemo versions, empty menu items have been hidden.
+    - 0.10.6:
+      - A bug with images/css links in epub has been fixed. All the links
+        inside XHTML files were interpreted relative to the root OPF location
+        instead of XHTML file location. As a result, some images were not shown
+        in epub books.
+    - 0.10.5:
+      - The migration tool from version 0.8.* has been fixed. After an upgrade
+        from 0.8.* to this version, the first opening of your library will take
+        some time.
+      - A freeze (on some PDB books with more than one page and images, and
+        using small font size) has been fixed.
+      - Several text selection related issues have been fixed.
+    - 0.10.4:
+      - Maemo support is back.
+      - Multiple fixes in the epub format support.
+  * debian/control:
+    - Re-introduced libzlui-maemo binary package.
+    - Different minor versions of the same ui packages ('libzlui-*') are
+      incompatible between each other but have the same name, and it can cause
+      problems on upgrades. This is not a reliable behavior, so now
+      'libzlui-*' packages don't provide 'libzlui' virtual package anymore.
+      Binary package 'fbreader' now strictly depends on same or newer binary
+      versions of one of 'libzlui-*' packages. (Closes: #521136)
+    - Bumped 'Standards-Version' to 3.8.1, no changes needed.
+  * debian/rules:
+    - Uncommented building maemo binaries.
+  * debian/dfsg-repack:
+    - Corrected to output usage when the parameter is not given.
+  * debian/patches:
+    - 005-maemo-makefile.patch: refreshed.
+    - New 020-maemo-disable-libconic.patch: disable libconic-related parts of
+      the maemo UI. Libconic depends on closed source, not even available
+      software.
+    - New 200-maemo-gtkentryparameter.patch: remove tuning-only hildon calls
+      that Debian GTK+ libraries cannot (yet?) satisfy.
+    - 930-use-shell-make-variable.patch: refreshed.
+    - debian/patches/940-use-debian-compiler-flags.patch: refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 01 May 2009 00:28:06 +0300
+
+fbreader (0.10.3dfsg-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - 0.10.3:
+      - Some issues related to multi-file tar, tar.gz and tar.bz2 archives
+        have been fixed.
+    - 0.10.2:
+      - Images order in mobipocket files has been corrected.
+      - Indonesian localization files have been updated.
+  * debian/dfsg-repack:
+    - Corrected to produce correct orig.tar.gz.
+  * debian/patches:
+    - 005-maemo-makefile.patch:
+      - Refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 27 Feb 2009 21:26:25 +0200
+
+fbreader (0.10.1dfsg-1) experimental; urgency=low
+
+  * Repacked upstream tarball, removed non-DFSG hyphenation patterns (el, fi,
+    tr languages). See also README.source.
+  * debian/README.source:
+    - Added with reasons of excluding hyphenation patterns from upstream
+      tarball.
+  * debian/copyright:
+    - Renewed copyrights, thanks to Frank Lichtenheld.
+    - Fixed GPLv2 license path on Debian systems.
+    - Mentioned all Debian packaging contributors.
+    - Provided full license and copyright info for hyphenation patterns.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 04 Feb 2009 22:59:58 +0200
+
+fbreader (0.10.1-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - Fixed never-ending loop under certain conditions when operating with
+      library and settings.
+  * debian/patches:
+    - 200-typo-in-searchonnetworkaction.patch: removed, went upstream.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sun, 18 Jan 2009 16:06:20 +0200
+
+fbreader (0.10.0-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - Searching and downloading books from www.feedbooks.com and
+      www.litres.ru.
+    - Partial CSS support for Epub files.
+    - Improved support for Epub and Mobipocket book formats.
+    - Added support for right-to-left languages and bidirectional text.
+    - Added Czech localization.
+  * debian/rules:
+    - Removed some old dh_makeshlibs magic for libzlcore and libzltext.
+    - Temporarily removed libzlui-maemo binary package until maemo support is
+      ready.
+    - Added build-deps: libfribidi-dev, libcurl4-gnutls-dev.
+  * debian/control:
+    - Bumped liblinebreak dependency version to 1.0.
+    - Made qt4 interface for fbreader the default one for new installs.
+    - Updated library binary package names '0.9' -> '0.10'.
+    - Removed some obsolete Conflicts and Replaces for libzlcore0.10 and
+      libzltext0.10.
+    - As GTK2 UI cannot substitute fonts, added Suggests on 'ttf-unifont'
+      for libzlui-gtk package. (Closes: #502040)
+    - Wrote up better short descriptions, modified a bit long description
+      for libzltext0.10. (Closes: #493616)
+    - Improved long description for the libzlcore-data package.
+    - Advanced fbreader long description according to new release.
+    - Added {misc:Depends} to Depends of all packages, fixing lintian
+      warnings.
+    - Removed duplicated 'Priority' fields from binary packages' entries.
+    - Divided architecture-independent data from package libzltext0.10 to its
+      own binary package (liblztext-data) as it leads to conflict problems
+      being in library package along .so files.
+    - Set DM-Upload-Allowed flag.
+  * debian/patches:
+    - 010-add-missing-headers.patch: deleted, went upstream.
+    - 100-fix-centering-with-margins.patch: deleted, went upstream.
+    - 910-remove-deprecated-fields-in-desktop-file.patch: deleted, went
+      upstream.
+    - New 200-typo-in-searchonnetworkaction.patch, cherry-picked from
+      upstream.
+    - Added comments to all Debian patches.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Tue, 13 Jan 2009 22:19:32 +0200
+
+fbreader (0.8.17-12) unstable; urgency=low
+
+  * debian/patches:
+    - New patch 930-use-shell-make-variable.patch. It allows to do 'make -jN'.
+    - New patch 940-use-debian-compiler-flags.patch. It allows to build
+      package with debian-specific flags.
+  * debian/rules:
+    - Added support for 'parallel=n' in DEB_BUILD_OPTIONS.
+    - Added support for 'noopt' in DEB_BUILD_OPTIONS.
+    - Now package builds with '-D_REENTRANT' flag.
+  * debian/control:
+    - Added missing dependency: libzlui-qt4 on libzlcore.
+    - Included SONAME's to library packages' names:
+      - Renamed 'libzlcore' package to 'libzlcore0.9'.
+      - Renamed 'libzltext' package to 'libzltext0.9'.
+    - Split arch-independent stuff from 'libzlcore' to 'libzlcore-data'
+      package.
+    - Fixed dependency: 'libzltext-dev' depends on 'libzltext', not
+      'libzlcore'.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 12 Jul 2008 20:05:47 +0300
+
+fbreader (0.8.17-11) unstable; urgency=low
+
+  * debian/control:
+    - Enhanced all ZLibrary descriptions, not the main one.
+    - Done some renaming to use canonical names of libraries and toolkits in
+      decriptions, as suggested by developers-reference:
+      'qt' -> 'Qt', 'gtk' -> 'GTK+', 'zlibrary' -> 'ZLibrary'.
+    - Bump 'Depends' on quilt to (>= 0.24).
+  * debian/rules:
+    - Included quilt makefile instead of quilt makefile instead
+      of copy&paste'ing it.
+  * debian/fbreader.links:
+    - Added this file to relay on dh_link's work instead of using 'ln -sf'
+      directly in the debian/rules.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Tue, 17 Jun 2008 23:01:53 +0300
+
+fbreader (0.8.17-10) unstable; urgency=low
+
+  * Switched to quilt patching system.
+  * debian/control:
+    - Enhanced description for libzlcore binary package.
+    - Added 'quilt' to Build-Depends.
+  * debian/rules:
+    - Removed unnecessary 'binary-indep', 'clean' rules.
+    - Added 'patch' and 'unpatch' rules.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 13 Jun 2008 14:01:27 +0300
+
+fbreader (0.8.17-9) unstable; urgency=low
+
+  * debian/control:
+    - Bump 'Standards-Version' to 3.8.0. No changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 11 Jun 2008 21:44:43 +0300
+
+fbreader (0.8.17-8) unstable; urgency=low
+
+  * debian/rules:
+    - Added creating symbolic links to provide lowercase-only path for
+      fbreader. (Closes: #434689)
+
+  * Applied patch: removed obsolete 'Encoding' entry from fbreader desktop
+    file.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Mon, 02 Jun 2008 01:25:10 +0300
+
+fbreader (0.8.17-7) unstable; urgency=low
+
+  * Applied patch: correct centering text honoring margins.
+    (Closes: #475696)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 30 May 2008 03:13:20 +0300
+
+fbreader (0.8.17-6) unstable; urgency=low
+
+  * New maintainer. (Closes: #483257)
+  * debian/control:
+    - Updated "Maintainer:" field.
+    - Removed "Vcs-Git" field.
+  * debian/rules:
+    - Added empty 'binary-indep', 'clean' rules to satisfy lintian.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 28 May 2008 23:16:09 +0300
+
+fbreader (0.8.17-5) unstable; urgency=low
+
+  * debhelper v7, rules file minimisation
+  * Orphaned the package.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 27 May 2008 19:18:07 -0400
+
+fbreader (0.8.17-4) unstable; urgency=low
+
+  * Use a newer version of liblinebreak-dev, which will properly link into
+    libzltext on more picky architectures. Closes: #475095
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 08 Apr 2008 19:53:36 -0400
+
+fbreader (0.8.17-3) unstable; urgency=low
+
+  * Add b-d on liblinebreak-dev. Closes: #474805
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 08 Apr 2008 17:28:05 -0400
+
+fbreader (0.8.17-2) unstable; urgency=low
+
+  * Header fix for gcc 4.3. Closes: #474805
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 07 Apr 2008 17:47:04 -0400
+
+fbreader (0.8.17-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 07 Apr 2008 12:29:01 -0400
+
+fbreader (0.8.15-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 09 Mar 2008 17:50:31 -0400
+
+fbreader (0.8.14-2) unstable; urgency=low
+
+  * Fix missing include in maemo UI to allow building with gcc 4.3.
+    Closes: #466756
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 20 Feb 2008 18:24:32 -0500
+
+fbreader (0.8.14-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 11 Feb 2008 12:07:34 -0500
+
+fbreader (0.8.13-1) unstable; urgency=low
+
+  * New Upstream Version. Closes: #461813
+  * Fixes orig tarball snafu. Closes: #462353
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 09 Feb 2008 13:31:33 -0500
+
+fbreader (0.8.12-3) unstable; urgency=low
+
+  * Add libzlui-maemo which allows using fbreader on the maemo platform, on
+    Debian. Thanks, Riku Voipio. Closes: #462299
+  * makefiles/arch/maemo.mk: Don't build with -thumb. (Riku)
+  * Loosen dependency versions some more, so it only depends on the current
+    upstream version or higher, ignoring the Debian revision.
+  * Use binary:Version instead of deprecated Source-Version.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Jan 2008 16:51:07 -0500
+
+fbreader (0.8.12-2) unstable; urgency=low
+
+  * Include dependency loosening changes.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 Jan 2008 13:27:08 -0500
+
+fbreader (0.8.12-1) unstable; urgency=low
+
+  * New upstream version. Closes: #461813
+  * Didn't include upstream's dependency changes yet.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 21 Jan 2008 12:59:59 -0500
+
+fbreader (0.8.11-1) stable; urgency=low
+
+  * new upstream version
+  * dependency rules have been changed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 12 Jan 2008 22:27:00 +0300
+
+fbreader (0.8.10-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 4 Jan 2008 20:53:00 +0300
+
+fbreader (0.8.9-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 31 Dec 2007 11:40:17 -0500
+
+fbreader (0.8.8a-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 18 Dec 2007 17:26:06 -0500
+
+fbreader (0.8.8-2) unstable; urgency=low
+
+  * Fix missing include to allow building with gcc 4.3. Closes: #456085
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 13 Dec 2007 01:47:01 -0500
+
+fbreader (0.8.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 04 Dec 2007 12:51:45 -0500
+
+fbreader (0.8.7b-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 15 Nov 2007 19:21:34 -0500
+
+fbreader (0.8.7-1) unstable; urgency=low
+
+  [ Nikolay Pultsin ]
+  * new upstream version
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 26 Oct 2007 04:57:02 -0400
+
+fbreader (0.8.6d-2) unstable; urgency=low
+
+  * Change %U to %F in menu file, as fbreader does not support URLs.
+    Closes: #447971
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 25 Oct 2007 13:36:19 -0400
+
+fbreader (0.8.6d-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 09 Sep 2007 13:16:49 -0400
+
+fbreader (0.8.6c-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 04 Sep 2007 20:22:41 -0400
+
+fbreader (0.8.6b-1) unstable; urgency=low
+
+  * Add real Homepage field. (Needs really new dpkg.)
+  * New upstream version. (Only Windows fixes.)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 27 Aug 2007 13:17:47 -0400
+
+fbreader (0.8.6a-2) unstable; urgency=low
+
+  * Fix handling of nostrip build option. Closes: #436837
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 11 Aug 2007 20:30:25 -0400
+
+fbreader (0.8.6a-1) unstable; urgency=low
+
+  [ Nikolay Pultsin ]
+  * new upstream version
+  * added libzlibrary-dev package
+
+  [ Joey Hess ]
+  * Small changes to the new -dev packages.
+  * Upload to Debian.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 08 Aug 2007 10:51:40 -0700
+
+fbreader (0.8.5c-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 19 Jul 2007 15:20:00 +0400
+
+fbreader (0.8.5b-1) unstable; urgency=low
+
+  * new upstream version
+  * almost all changes from the previous change are now included into
+    the upstream version: zlibrary shared objects moving, rpath deletion,
+    and the man page.
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Tue, 10 Jul 2007 21:50:00 +0400
+
+fbreader (0.8.5a-1) unstable; urgency=low
+
+  * First upload to Debian. Closes: #432274
+  * Misc debianisation changes.
+  * Move zlibrary shared object files to /usr/lib from /usr/share.
+  * Remove use of rpath.
+  * Use sensible-browser.
+  * Added a basic man page.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Jul 2007 15:04:31 -0400
+
+fbreader (0.8.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.4zz-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 5 Jul 2007 03:17:00 +0400
+
+fbreader (0.8.4z-2) stable; urgency=low
+
+  * postinst/postrm scripts were added
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 29 Jun 2007 21:23:00 +0400
+
+fbreader (0.8.4z-1) stable; urgency=low
+
+  * Initial release.
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 29 Jun 2007 17:53:00 +0400
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat b/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
new file mode 100644
index 000000000..ba0a99823
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
@@ -0,0 +1,83 @@
+Source: tde-ebook-reader
+Section: text
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev,
+               libbz2-dev, libexpat1-dev, libfribidi-dev,
+               libsqlite3-dev, libunibreak-dev, libz-dev, pkgconf
+Standards-Version: 4.7.0
+
+Package: tde-ebook-reader
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: sensible-utils,
+Description: e-book reader for TDE
+ tde-ebook-reader is an e-book reader for TDE.
+ .
+ Main features:
+  * supports several open e-book formats: fb2, html, chm, plucker,
+    palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
+    mobipocket, plain text, epub, eReader
+  * reads directly from tar, zip, gzip, bzip2 archives (you can have
+    several books in one archive)
+  * supports a structured view of your e-book collection
+  * automatically determines encodings
+  * automatically generates a table of contents
+  * keeps the last open book and the last read positions for all open books
+    between runs
+  * automatic hyphenation (patterns for several languages are included)
+  * searching and downloading books from www.feedbooks.com and www.litres.ru
+  * partial CSS support for epub files
+
+Package: libzlcore-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt
+Description: ZLibrary TQt3-based development library (shared library)
+ This is the core of ZLibrary, the library that tde-ebook-reader is based on.
+
+Package: libzlcore-data-tqt
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Description: ZLibrary TQt3-based development library (support files)
+ This package contains the support files for the core of ZLibrary, the library
+ that the fbreader e-book reader is based on.
+
+Package: libzltext-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt
+Description: ZLibrary TQt3-based text model/viewer part (shared library)
+ This package provides text model/viewer part of ZLibrary.
+
+Package: libzltext-data-tqt
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Description: ZLibrary TQt3-based text model/viewer part (support files)
+ This package contains the support files for the text model/viewer part
+ of ZLibrary.
+
+Package: libzlcore-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt
+Description: ZLibrary TQt3-based development library (development files)
+ This package contains development files for the ZLibrary core.
+
+Package: libzltext-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt
+Description: ZLibrary TQt3-based text model/viewer part (development files)
+ This package contains development files for the ZLibrary text model/viewer
+ library.
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright b/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright
new file mode 100644
index 000000000..5135a02bf
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright
@@ -0,0 +1,578 @@
+This code was ported to TDE and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/fbreader/0.99.4+dfsg-6
+
+Below is the original information from the Debian copyright file.
+-----------------------------------------------------------------
+
+This is the Debian prepackaged version of FBReader.
+
+It was originally Debianised by Nikolay Pultsin <geometer@fbreader.org>, and
+later modified and improved by Joey Hess <joeyh@debian.org> and
+Eugene V. Lyubimkin <jackyf@debian.org>.
+
+Sources are downloaded from its website at:
+
+	http://www.fbreader.org/
+
+It is copyright as follows:
+
+/*
+ * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+On Debian systems, the full text of the GPLv2 can be found in
+/usr/share/common-licenses/GPL-2.
+
+
+Hyphenation patterns (zlibrary/text/data/hyphenationPatterns.zip):
+
+Files fi.pattern, tr.pattern, el.pattern were removed from upstream tarball.
+Check README.source to see why. You can reproduce removing procedure by using
+script debian/dfsg-repack.
+
+
+Files: cs.pattern
+License: GPLv2+.
+
+Files: en.pattern
+License: specific (follows)
+
+% Unlimited copying and redistribution of this file are permitted as long
+% as this file is not modified. Modifications are permitted, but only if
+% the resulting file is not named hyphen.tex.
+
+Files: de-traditional.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+%               [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+%               [macros, adaption for TeX 2]
+%
+
+Files: de.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+%               [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+%               [macros, adaption for TeX 2]
+% Copyright (C) 1998-2001 Walter Schmidt
+%               [adaption to new German orthography]
+%
+
+Files: eo.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright (C) 1999 Sergei B. Pokrovsky <pok@iis.nsk.su>
+
+Files: es.pattern
+License: Latex Project Public License
+Copyrights:
+
+% (c) Javier Bezos 1993 1997.
+% (c) Javier Bezos and CervanTeX 2001-2006
+% Some parts, (c) by Francesc Carmona
+
+Files: fr.pattern
+License: specific (follows)
+
+% This file is available for free and can used and redistributed
+% asis for free. Modified versions should have another name.
+
+Files: id.pattern
+License: GPLv2
+Copyrights: (c) Copyright 1996, 1997 J\"org Knappen and Terry Mart
+
+Files: it.pattern
+License: LGPLv2.1+
+Copyrights: Copyright  1998, 2007 Claudio Beccari
+
+Files: no.pattern:
+Copyrights: Copyright (C) 2004, 2005 Rune Kleveland, Ole Michael Selberg.
+License: specific (follows)
+
+% Copying and distribution of this file, with or without modification,
+% are permitted in any medium without royalty provided the copyright
+% notice and this notice are preserved.
+
+Files: pt.pattern:
+License: Latex Project Public License 1+
+Copyrights:
+
+% (C) 1996 by  Pedro J. de Rezende (rezende@dcc.unicamp.br)
+%          and J.Joao Dias Almeida (jj@di.uminho.pt)
+% Version: 1.2 Release date: 21/07/96
+%
+% (C) 1994 by Pedro J. de Rezende (rezende@dcc.unicamp.br)
+% Version: 1.1 Release date: 04/12/94
+%
+% (C) 1987 by Pedro J. de Rezende
+% Version: 1.0 Release date: 02/13/87
+
+Files: sv.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1994 by Jan Michael Rynning. All rights reserved.
+
+Files: uk.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright 1999 Andrij Shvaika
+
+Files: ru.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1999-2003 Alexander I. Lebedev <swan@scon155.phys.msu.su>
+
+
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification'
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter'
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work;
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.
+
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  %
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
+
+LGPLv2.1 clause:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+On Debian systems, the full text of the LGPLv2.1 can be found in
+/usr/share/common-licenses/LGPL-2.1.
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install
new file mode 100644
index 000000000..322cc7393
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install
@@ -0,0 +1,6 @@
+/usr/share/zlibrary-tqt/keynames.desktop-tqt.xml
+/usr/share/zlibrary-tqt/languagePatterns.zip
+/usr/share/zlibrary-tqt/unicode.xml.gz
+/usr/share/zlibrary-tqt/default/
+/usr/share/zlibrary-tqt/encodings/
+/usr/share/zlibrary-tqt/resources/
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
new file mode 100644
index 000000000..4f30f38c6
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
@@ -0,0 +1,2 @@
+/usr/include/zlibrary-tqt/core
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
new file mode 100644
index 000000000..3a6addd23
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
@@ -0,0 +1 @@
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install
new file mode 100644
index 000000000..55acf8e02
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install
@@ -0,0 +1 @@
+/usr/share/zlibrary-tqt/hyphenationPatterns.zip
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
new file mode 100644
index 000000000..95be86c20
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
@@ -0,0 +1,2 @@
+/usr/include/zlibrary-tqt/text
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
new file mode 100644
index 000000000..3faed63a9
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
@@ -0,0 +1 @@
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.*
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/patches/series b/ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/patches/series
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules
new file mode 100755
index 000000000..8413cf890
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCMAKE_ZLIBRARY_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"
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/source/format b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/system/kpowersave/debian/source/format
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/format
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/source/options b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/system/kpowersave/debian/source/options
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install
new file mode 100644
index 000000000..59065ad25
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install
@@ -0,0 +1,2 @@
+/opt/trinity/bin
+/opt/trinity/share
diff --git a/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/office/tellico/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/tellico/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/office/tellico/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/tellico/debian/compat
+++ b/ubuntu/_base/applications/office/tellico/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control
index 4866a3f73..5e4e2fc19 100644
--- a/ubuntu/_base/applications/office/tellico/debian/control
+++ b/ubuntu/_base/applications/office/tellico/debian/control
@@ -3,10 +3,10 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Regis Boudin <regis@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtdepim1-trinity-dev,
  libxml2-dev, libxslt1-dev, libtag1-dev, libyaz-dev,
- libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev
+ libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev, dh-python
 Standards-Version: 3.8.4
 Homepage: http://periapsis.org/tellico/
 
@@ -31,11 +31,11 @@ Description: collection manager for books, videos, music [Trinity]
 
 Package: tellico-data-trinity
 Architecture: all
-Depends: tdelibs-data-trinity
+Depends: tdelibs-data-trinity, ${python3:Depends}
 Replaces: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~)
 Breaks: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~)
 Recommends: tellico-trinity
-Suggests: python-all
+Suggests: python3-all
 Description: collection manager for books, videos, music [data] [Trinity]
  Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -55,10 +55,11 @@ Description: collection manager for books, videos, music [data] [Trinity]
 
 Package: tellico-scripts-trinity
 Architecture: all
+Depends: ${python3:Depends}
 Recommends: tellico-trinity
 Replaces: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~)
 Breaks: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~)
-Suggests: python-all, ruby
+Suggests: python3-all, ruby
 Description: collection manager for books, videos, music [scripts] [Trinity]
  Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
diff --git a/ubuntu/_base/applications/office/tellico/debian/docs b/ubuntu/_base/applications/office/tellico/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/office/tellico/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/office/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules
index 0c4cf46b6..e6f5916b6 100755
--- a/ubuntu/_base/applications/office/tellico/debian/rules
+++ b/ubuntu/_base/applications/office/tellico/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -26,6 +25,7 @@ binary-install/tellico-data-trinity::
 	[ ! -d debian/tmp/opt/trinity/share/mime ] || \
 	mv debian/tmp/opt/trinity/share/mime debian/$(cdbs_curpkg)/usr/share/
 	mv debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico.xml debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico-trinity.xml
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico
 
-binary-install/tellico-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+binary-install/tellico-scripts-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico/data-sources
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
index a45d88c99..c20347b59 100644
--- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
@@ -1,3 +1,5 @@
 debian/tmp/opt/trinity/bin/*
-debian/tellico.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/tellico.1
+
+debian/tellico.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
deleted file mode 100644
index 68831ac30..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tellico.1x
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico.1x b/ubuntu/_base/applications/office/tellico/debian/tellico.1x
deleted file mode 100644
index 29a569a0b..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/tellico.1x
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH TELLICO: "1x" "March 2008"
-.SH NAME
-Tellico \- a collection manager for TDE
-.SH SYNOPSIS
-.B tellico
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfilename\fR]
-.SH DESCRIPTION
-Tellico \- a collection manager for TDE
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-nofile\fR
-Do not reopen the last open file
-.TP
-\fB\-\-bibtex\fR
-Import <filename> as a bibtex file
-.TP
-\fB\-\-mods\fR
-Import <filename> as a MODS file
-.TP
-\fB\-\-ris\fR
-Import <filename> as a RIS file
-.SS "Arguments:"
-.TP
-filename
-File to open
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/compat
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control
index ef413b9de..560249d23 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/control
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kdpkg-trinity
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/docs
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/rules b/ubuntu/_base/applications/settings/kdpkg/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/settings/kdpkg/debian/rules
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kima/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kima/debian/compat
+++ b/ubuntu/_base/applications/settings/kima/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control
index 75e8156c6..0fc1a649c 100644
--- a/ubuntu/_base/applications/settings/kima/debian/control
+++ b/ubuntu/_base/applications/settings/kima/debian/control
@@ -2,7 +2,7 @@ Source: kima-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
  libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/applications/settings/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs
index 1a4f0317f..1a960e71b 100644
--- a/ubuntu/_base/applications/settings/kima/debian/docs
+++ b/ubuntu/_base/applications/settings/kima/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 FAQ
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules
index 7ae24f493..22f1bcdb9 100755
--- a/ubuntu/_base/applications/settings/kima/debian/rules
+++ b/ubuntu/_base/applications/settings/kima/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF)
 
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/compat
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control
index 48f6bd9a1..dee0db757 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/control
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs
index 724e08449..6f7727790 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/docs
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 1ee900501..bc9f7dace 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -59,7 +59,7 @@
 +    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
-+      TDEApplication::kapp->processEvents();
++      TDEApplication::tdeApp->processEvents();
 +    }
 +    bool exists = TQFile::exists(url.path());
 +    return exists;
@@ -88,7 +88,7 @@
 +    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
-+      TDEApplication::kapp->processEvents();
++      TDEApplication::tdeApp->processEvents();
 +    }
 +
 +    TQProcess proc2;
@@ -96,7 +96,7 @@
 +    proc2.addArgument("chmod 0644 " + dest.path());
 +    proc2.launch(buffer);
 +    while (!proc2.normalExit()) {
-+      TDEApplication::kapp->processEvents();
++      TDEApplication::tdeApp->processEvents();
 +    }
 +
 +    bool exists = TQFile::exists(dest.path());
@@ -116,7 +116,7 @@
 +    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
-+      TDEApplication::kapp->processEvents();
++      TDEApplication::tdeApp->processEvents();
 +    }
 +    bool exists = !TQFile::exists(url.path());
 +    return exists;
@@ -135,7 +135,7 @@
 +    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
-+      TDEApplication::kapp->processEvents();
++      TDEApplication::tdeApp->processEvents();
 +    }
 +
 +    bool exists = TQFile::exists(target.path());
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/rules b/ubuntu/_base/applications/settings/kiosktool/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/kiosktool/debian/rules
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/compat b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/compat
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/control b/ubuntu/_base/applications/settings/kkbswitch/debian/control
index 7830b8afc..fcc3401c1 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/control
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev
 Standards-Version: 3.7.3
 Homepage: http://kkbswitch.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/rules b/ubuntu/_base/applications/settings/kkbswitch/debian/rules
index 0f666b3ca..7dffb7fba 100755
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/rules
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/compat b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/compat
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/control b/ubuntu/_base/applications/settings/klcddimmer/debian/control
index 14a27e356..9934bf24d 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/control
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/control
@@ -2,7 +2,7 @@ Source: klcddimmer-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.7.3
 Homepage: http://klcddimeer.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/docs
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/rules b/ubuntu/_base/applications/settings/klcddimmer/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/rules
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
index 7754434bd..0c8478caa 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/control
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
@@ -2,7 +2,7 @@ Source: kmyfirewall-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kmyfirewall.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
deleted file mode 100644
index f0312285e..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-opt/trinity/bin
-opt/trinity/share/doc/tde/HTML/en
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
deleted file mode 100644
index 3a28b6931..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
deleted file mode 100644
index 3a562e7c0..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ /dev/null
@@ -1,44 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-TDE-ServiceType=KMyFirewall/Installer
-X-TDE-Library=libkmfinstallerplugin
-
-Name=KMyFirewall Installer Plugin
-Name[bg]=При�тавка-ин�талатор на KMyFirewall
-Name[br]=Lugent stalier KMyFirewall
-Name[bs]=KMyFirewall dodatak za instalaciju
-Name[ca]=Connector d'instal·lació per a KMyFirewall
-Name[cs]=Modul instalátoru KMyFirewall
-Name[de]=KMyFirewall Installationsprogramm
-Name[el]=Π�όσθετο εγκατάστασης για το KMyFirewall
-Name[es]=Complemento de instalación de KMyFirewall
-Name[et]=KMyFirewalli paigaldamisplugin
-Name[fr]=Module d'installation de KMyFirewall
-Name[gl]=Extensión de Instalazón de KMyFirewall
-Name[hi]=के-माइ-फायरवाल संस�थापक प�लगइन
-Name[hu]=KMyFirewall telepítőmodul
-Name[it]=Plugin di installazione di KMyFirewall
-Name[ja]=KMyFirewall インストーラ プラグイン
-Name[ka]=KMyFirewall დ�ყენების მ�დული
-Name[nl]=KMyFirewall Installatieplugin
-Name[pa]=KMyFirewall ਇੰਸਟਾਲਰ ਪਲੱਗਿੰਨ
-Name[pl]=Wtyczka instalatora KMyFirewall
-Name[pt]='Plugin' de Instalação do KMyFirewall
-Name[pt_BR]=Plug-in Instaldor par ao KMyFirewall
-Name[ru]=KMyFirewall - Модуль у�тановки
-Name[sr]=KMyFirewall-ов прикључак за ин�талирање
-Name[sr@Latn]=KMyFirewall-ov priklju�ak za instaliranje
-Name[sv]=Installationsdel för Min brandvägg
-Name[ta]=KMyதீச�ச�வர� நிற�வ�பவரைச� சொர�க�
-Name[tr]=KMyFirewall Kurulum Eklentisi
-Name[uk]=Втулок в�тановленн� KMyFirewall
-Name[xx]=xxKMyFirewall Installer Pluginxx
-Name[zh_CN]=KMyFirewall 安装程��件
-
-[PropertyDef::X-KMyFirewall-Platform]
-Type=TQString
-
-[PropertyDef::X-KMyFirewall-Language]
-Type=TQString
-
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
deleted file mode 100644
index cff01643d..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
+++ /dev/null
@@ -1,162 +0,0 @@
-.TH kmyfirewall "1" "January 2004" TDE "TDE Application"
-.SH NAME
-kmyfirewall \- TDE iptables front\-end to easily create a "Personal Firewall" 
-.SH SYNOPSIS
-.B kmyfirewall
-[\fIQt\-options\fR] [\fITDE\-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmyfirewall
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don\'t have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a
-Firewall that keeps the "bad" people out
-.SH OPTIONS
-.SS "General Options"
-.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\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "\-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-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
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM\-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KMyFirewall was written by 
-.nh
-.ad l
-Christian Hubinger <e9806056@student.tuwien.ac.at>.
-.hy
-.br
-This manual page was prepared by
-.nh
-.ad l
-Alberto Gonzalez Iniesta <agi@inittab.org>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kmyfirewall
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kmyfirewall
-
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
deleted file mode 100644
index 57f12ad9c..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
+++ /dev/null
@@ -1,35 +0,0 @@
-[Desktop Entry]
-Type=Application
-MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
-Icon=kmyfirewall
-Exec=/opt/trinity/bin/kmyfirewall %u
-Terminal=false
-Categories=Qt;TDE;System;
-Name=KMyFirewall
-Name[sv]=Min brandvägg
-Name[xx]=xxKMyFirewallxx
-GenericName=Firewall Configuration Tool
-GenericName[bg]=�а�тройване на защитна �тена
-GenericName[es]=Herramienta de configuración de cortafuegos
-GenericName[et]=Tulemüüri seadistamistööriist
-GenericName[it]=Strumento di configurazione di KMyFirewall
-GenericName[nl]=Firewall-configuratieprogramma
-GenericName[pt]=Ferramenta de Configuração da Firewall
-GenericName[pt_BR]=Ferramenta de Configuração da Firewall
-GenericName[sr]=�лат за подешавање заштитног зида
-GenericName[sr@Latn]=�лат за подешавање заштитног зида
-GenericName[sv]=Verktyg för brandväggsinställning
-GenericName[xx]=xxFirewall Configuration Toolxx
-Comment=Firewall Configuration Tool
-Comment[bg]=�а�тройване на KMyFirewall
-Comment[es]=Herramienta de configuración de cortafuegos
-Comment[et]=Tulemüüri seadistamistööriist
-Comment[it]=Strumento di configurazione di KMyFirewall
-Comment[ms]=Alatan Tetapan Firewall
-Comment[nl]=Firewall-configuratieprogramma
-Comment[pt]=Ferramenta de Configuração da Firewall
-Comment[pt_BR]=Ferramenta de Configuração da Firewall
-Comment[sr]=�лат за подешавање заштитног зида
-Comment[sr@Latn]=�лат за подешавање заштитног зида
-Comment[sv]=Verktyg för inställning av brandvägg
-Comment[xx]=xxFirewall Configuration Toolxx
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
deleted file mode 100644
index 3d58b81ff..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
+++ /dev/null
@@ -1,369 +0,0 @@
-/* XPM */
-static char * kmyfirewall_xpm[] = {
-"32 32 334 2",
-"  	c None",
-". 	c #FE0000",
-"+ 	c #E60000",
-"@ 	c #E10000",
-"# 	c #EA0000",
-"$ 	c #EF0000",
-"% 	c #E40000",
-"& 	c #DA0000",
-"* 	c #D70000",
-"= 	c #DC0000",
-"- 	c #F50F0F",
-"; 	c #F02525",
-"> 	c #EE4949",
-", 	c #EB6C6C",
-"' 	c #F89999",
-") 	c #FBAFAF",
-"! 	c #FDC4C4",
-"~ 	c #FDCACA",
-"{ 	c #FCC2C2",
-"] 	c #FBB2B2",
-"^ 	c #F59494",
-"/ 	c #E87272",
-"( 	c #DD4343",
-"_ 	c #D42929",
-": 	c #EF0808",
-"< 	c #ED5858",
-"[ 	c #F29191",
-"} 	c #F7BCBC",
-"| 	c #FBC8C8",
-"1 	c #FCCCCC",
-"2 	c #FDCCCC",
-"3 	c #FECCCC",
-"4 	c #FBC9C9",
-"5 	c #F6B7B7",
-"6 	c #ED9999",
-"7 	c #D54D4D",
-"8 	c #BF1313",
-"9 	c #E82525",
-"0 	c #EB7F7F",
-"a 	c #F8CCCC",
-"b 	c #FACCCC",
-"c 	c #FBCCCC",
-"d 	c #F9CCCC",
-"e 	c #F6C6C6",
-"f 	c #E58E8E",
-"g 	c #B91A1A",
-"h 	c #DE0000",
-"i 	c #E46969",
-"j 	c #F4BEBE",
-"k 	c #F8C9C9",
-"l 	c #F9C9C9",
-"m 	c #FAC9C9",
-"n 	c #FCC9C9",
-"o 	c #FDC9C9",
-"p 	c #FECBCB",
-"q 	c #FECFCF",
-"r 	c #FEC9C9",
-"s 	c #F7C9C9",
-"t 	c #F5C5C5",
-"u 	c #D55C5C",
-"v 	c #AF0A0A",
-"w 	c #CC0000",
-"x 	c #EEA4A4",
-"y 	c #F3B5B5",
-"z 	c #F5B5B5",
-"A 	c #F7B5B5",
-"B 	c #F9B5B5",
-"C 	c #FAB5B5",
-"D 	c #FBB5B5",
-"E 	c #FCB5B5",
-"F 	c #FDC3C3",
-"G 	c #FFF1F1",
-"H 	c #FDB9B9",
-"I 	c #F6B5B5",
-"J 	c #F4B5B5",
-"K 	c #F2B5B5",
-"L 	c #E88B8B",
-"M 	c #C81818",
-"N 	c #9E0000",
-"O 	c #EE0000",
-"P 	c #C90000",
-"Q 	c #EB9393",
-"R 	c #F0A2A2",
-"S 	c #F2A2A2",
-"T 	c #F4A2A2",
-"U 	c #F6A2A2",
-"V 	c #F7A2A2",
-"W 	c #F9A2A2",
-"X 	c #FAA2A2",
-"Y 	c #FCBDBD",
-"Z 	c #FFF5F5",
-"` 	c #FCB3B3",
-" .	c #F8A2A2",
-"..	c #F5A2A2",
-"+.	c #F3A2A2",
-"@.	c #F1A2A2",
-"#.	c #EFA2A2",
-"$.	c #E57D7D",
-"%.	c #CC1616",
-"&.	c #B00000",
-"*.	c #8F0000",
-"=.	c #F20000",
-"-.	c #D20000",
-";.	c #C30000",
-">.	c #C80000",
-",.	c #DC4747",
-"'.	c #E97C7C",
-").	c #ED8282",
-"!.	c #EF8282",
-"~.	c #F28282",
-"{.	c #F48282",
-"].	c #F68888",
-"^.	c #F9A6A6",
-"/.	c #FDD9D9",
-"(.	c #FFFFFF",
-"_.	c #FDE4E4",
-":.	c #F89898",
-"<.	c #F48484",
-"[.	c #F38282",
-"}.	c #F08282",
-"|.	c #EE8282",
-"1.	c #EC8282",
-"2.	c #E97F7F",
-"3.	c #D83E3E",
-"4.	c #C80505",
-"5.	c #BD0000",
-"6.	c #A20000",
-"7.	c #C50000",
-"8.	c #D11111",
-"9.	c #DE4343",
-"0.	c #E86969",
-"a.	c #EB6969",
-"b.	c #EE6969",
-"c.	c #F06969",
-"d.	c #F37878",
-"e.	c #FBCECE",
-"f.	c #FFF7F7",
-"g.	c #FEF2F2",
-"h.	c #F69999",
-"i.	c #F59999",
-"j.	c #EF7070",
-"k.	c #EC6969",
-"l.	c #EA6969",
-"m.	c #E66666",
-"n.	c #DF4B4B",
-"o.	c #CD0B0B",
-"p.	c #C60000",
-"q.	c #BF0000",
-"r.	c #B40000",
-"s.	c #7C0000",
-"t.	c #D40000",
-"u.	c #C70000",
-"v.	c #CD0000",
-"w.	c #D20101",
-"x.	c #DB1E1E",
-"y.	c #E13535",
-"z.	c #E74343",
-"A.	c #E94646",
-"B.	c #F06C6C",
-"C.	c #FCE4E4",
-"D.	c #FFFCFC",
-"E.	c #FACECE",
-"F.	c #FAD8D8",
-"G.	c #EC6363",
-"H.	c #E54141",
-"I.	c #E13838",
-"J.	c #D81A1A",
-"K.	c #D00404",
-"L.	c #CA0000",
-"M.	c #BB0000",
-"N.	c #940000",
-"O.	c #FD0000",
-"P.	c #D00000",
-"Q.	c #D50202",
-"R.	c #D90808",
-"S.	c #DF1414",
-"T.	c #E21D1D",
-"U.	c #EA4F4F",
-"V.	c #FBDCDC",
-"W.	c #FFFEFE",
-"X.	c #FDEFEF",
-"Y.	c #EC7171",
-"Z.	c #DD1212",
-"`.	c #D90909",
-" +	c #D30101",
-".+	c #CF0000",
-"++	c #A10000",
-"@+	c #6C0000",
-"#+	c #E70000",
-"$+	c #BE0000",
-"%+	c #CB0000",
-"&+	c #CE0000",
-"*+	c #D30000",
-"=+	c #D60000",
-"-+	c #DC1010",
-";+	c #EA6565",
-">+	c #E53B3B",
-",+	c #F8C7C7",
-"'+	c #FCEBEB",
-")+	c #DA1111",
-"!+	c #D50303",
-"~+	c #D10000",
-"{+	c #C00000",
-"]+	c #BC0000",
-"^+	c #AD0000",
-"/+	c #7B0000",
-"(+	c #DB0000",
-"_+	c #D50000",
-":+	c #DD2828",
-"<+	c #F7CACA",
-"[+	c #F6BCBC",
-"}+	c #E45656",
-"|+	c #E04545",
-"1+	c #C10000",
-"2+	c #B30000",
-"3+	c #810000",
-"4+	c #E25050",
-"5+	c #FBE7E7",
-"6+	c #F9DFDF",
-"7+	c #BA0000",
-"8+	c #840000",
-"9+	c #E76A6A",
-"0+	c #FDF4F4",
-"a+	c #FEFAFA",
-"b+	c #FEF8F8",
-"c+	c #C40000",
-"d+	c #C20000",
-"e+	c #E66B6B",
-"f+	c #FDF3F3",
-"g+	c #F2A7A7",
-"h+	c #EA7777",
-"i+	c #F5C7C7",
-"j+	c #830000",
-"k+	c #D90000",
-"l+	c #E66767",
-"m+	c #ED8989",
-"n+	c #E34848",
-"o+	c #F1A8A8",
-"p+	c #DD0000",
-"q+	c #E44C4C",
-"r+	c #FBE0E0",
-"s+	c #FBE5E5",
-"t+	c #E64E4E",
-"u+	c #E23535",
-"v+	c #F2A5A5",
-"w+	c #FADCDC",
-"x+	c #F8D6D6",
-"y+	c #DB2020",
-"z+	c #D50404",
-"A+	c #740000",
-"B+	c #D80000",
-"C+	c #E75858",
-"D+	c #EF8989",
-"E+	c #F3A3A3",
-"F+	c #EA5E5E",
-"G+	c #DF0D0D",
-"H+	c #DE0B0B",
-"I+	c #E33232",
-"J+	c #F7C6C6",
-"K+	c #EF9B9B",
-"L+	c #DB1818",
-"M+	c #620000",
-"N+	c #E00C0C",
-"O+	c #F29696",
-"P+	c #E52727",
-"Q+	c #EC5E5E",
-"R+	c #F28F8F",
-"S+	c #E20D0D",
-"T+	c #E00000",
-"U+	c #EE7A7A",
-"V+	c #DF0B0B",
-"W+	c #900000",
-"X+	c #420000",
-"Y+	c #E20000",
-"Z+	c #E30404",
-"`+	c #F18080",
-" @	c #EC4646",
-".@	c #E61010",
-"+@	c #EA3434",
-"@@	c #E50404",
-"#@	c #EF6B6B",
-"$@	c #E51717",
-"%@	c #630000",
-"&@	c #E80000",
-"*@	c #E90000",
-"=@	c #EC2020",
-"-@	c #FCD4D4",
-";@	c #EB1010",
-">@	c #EE3434",
-",@	c #FAC7C7",
-"'@	c #FEF3F3",
-")@	c #F69898",
-"!@	c #9D0000",
-"~@	c #EC0000",
-"{@	c #ED0000",
-"]@	c #F34C4C",
-"^@	c #FCCDCD",
-"/@	c #FCDBDB",
-"(@	c #F24F4F",
-"_@	c #F89D9D",
-":@	c #FFF9F9",
-"<@	c #F78A8A",
-"[@	c #F02424",
-"}@	c #700000",
-"|@	c #F30000",
-"1@	c #F40000",
-"2@	c #F40C0C",
-"3@	c #FA7676",
-"4@	c #FA7C7C",
-"5@	c #F51C1C",
-"6@	c #F73F3F",
-"7@	c #F62525",
-"8@	c #6F0000",
-"9@	c #F80000",
-"0@	c #F70000",
-"a@	c #F80404",
-"b@	c #F80808",
-"c@	c #DF0000",
-"d@	c #960000",
-"e@	c #710000",
-"f@	c #9A0000",
-"g@	c #F00000",
-"h@	c #A80000",
-"i@	c #800000",
-"j@	c #F10000",
-"k@	c #F90000",
-"l@	c #FC0000",
-"m@	c #660000",
-"n@	c #750000",
-"o@	c #8D0000",
-"p@	c #980000",
-"q@	c #A00000",
-"r@	c #9C0000",
-"s@	c #690000",
-"                                                                ",
-"                      . + @ # $ % & * =                         ",
-"                - ; > , ' ) ! ~ { ] ^ / ( _                     ",
-"              : < [ } | 1 2 3 3 2 2 1 4 5 6 7 8                 ",
-"            9 0 a b c 1 2 3 3 3 3 2 2 c b d e f g               ",
-"          h i j k l m n o o p q r o n 4 m l s t u v             ",
-"        h w x y z A B C D E F G H E C B A I J K L M N           ",
-"      O P P Q R S T U V W X Y Z ` X  .V ..+.@.#.$.%.&.*.        ",
-"    =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.        ",
-"    % 7.;.>.8.9.0.a.b.c.d.e.f.(.g.h.i.j.k.l.m.n.o.p.q.r.s.      ",
-"    t.5.;.u.v.w.x.y.z.A.B.C.(.(.D.E.F.G.H.I.J.K.L.p.q.M.N.      ",
-"  O.;.5.;.u.w P.Q.R.S.T.U.V.(.(.(.W.X.Y.Z.`. +.+P 7.q.M.++@+    ",
-"  #+M.$+;.u.%+&+*+=+-+;+>+,+(.(.(.(.(.'+)+!+~+v.P 7.{+]+^+/+    ",
-"  (+M.q.;.u.%+&+-._+:+<+[+'+(.(.(.(.(.(.}+|+P.v.P 7.1+5.2+3+    ",
-"  t.$+1+7.u.%+&+~+t.4+5+(.(.(.(.(.(.(.(.(.6+.+v.P u.;.{+7+8+    ",
-"  t.1+;.p.>.%+&+~+*+9+0+(.(.(.(.a+b+(.(.(.6+.+v.L.u.c+d+$+8+    ",
-"  _+7.p.P %+&+P.-.e+f+(.(.(.(.(.g+h+(.(.(.i+~+.+v.L.u.p.{+j+    ",
-"  k+>.L.w &+P.~+t.l+(.(.(.(.(.(.m+n+(.(.(.o+-.~+.+v.%+P {+3+    ",
-"  p+&+.+~+-.*+_+* q+(.(.r+'+r+s+t+u+v+w+(.x+y+z+*+-..+&+M.A+    ",
-"  (+*+*+t._+* B+& C+(.(.D+z E+F+G+H+I+J+(.D.K+L+=+_+*+*+&.M+    ",
-"    t.k+(+(+p+p+N+O+(.(.P+Q+R+S+T+@ T+G.(.(.U+V+= (+& k+W+X+    ",
-"    P.(+T+T+@ Y+Z+`+(.(. @.@+@@@% % % #@(.X.$@Y+@ T+T+_+%@      ",
-"      ~++ #+&@&@*@=@-@D.h.;@# # # # >@,@'@)@&@&@#+#+h !@        ",
-"      $+@ ~@~@~@{@{@]@^@/@(@{@{@{@{@_@:@<@[@{@~@~@~@p.}@        ",
-"        $+Y+|@1@|@1@1@2@3@4@1@1@1@5@6@7@1@1@1@1@=.(+8@          ",
-"          $+$ 9@0@0@9@9@a@b@9@9@9@9@9@9@0@0@0@0@c@d@            ",
-"            ^+B+9@O.O.O.O.O.O.O.O.O.O.O.O.O.|@*+e@              ",
-"              f@;.$ . . . . . . . . . . . g@h@A+                ",
-"                  i@2+.+&@j@k@l@9@j@Y+&+N m@                    ",
-"                      n@o@p@q@6.r@N.i@s@X+                      ",
-"                                                                ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
deleted file mode 100644
index fab755280..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kmyfirewall.1
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
index 8b7e87e26..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-binary-install/kmyfirewall-trinity::
-	rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-	chmod +x debian/$(cdbs_curpkg)/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh
+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/applications/settings/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
deleted file mode 100644
index 42dfe005b..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmyfirewall/kmyfirewall-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
deleted file mode 100644
index 58dd721cb..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
-  * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
-  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
-  * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
-  * Repaired poor usability for new wireless connections
-  * Repaired poor usability for connection management
-  * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
-  * Repaired VPN plugins
-  * VPNC now allows hashed group password
-  * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
-  * Patched backend for new NM0.8 API
-  * Repaired poor usability in the "new connection" tasktray menu
-  * Repaired poor usability in the available devices tasktray menu
-  * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
-  * Updated SVN snapshot (r941706).
-  * debian/patches/04-dbus_access.patch
-    - Most of the relevant changes have been merged upstream. The patch now
-      only contains the Debian specific group "netdev" section.
-  * debian/control
-    - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
-  * debian/patches/05-no_blank_psk.patch
-    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
-      to validate them. Closes: #517213
-      Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
-  * Merge experimental branch into unstable. Remaining changes:
-    - Remove 07-indicate_manual_config.patch, obsolete. 
-  * debian/control
-    - Wrap Build-Depends.
-    - Bump Build-Depends on debhelper to (>= 7).
-  * debian/compat
-    - Bump debhelper compat level to 7.
-  * debian/rules
-    - Include debhelper.mk before any other files as recommended by the cdbs
-      documentation.
-  * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
-  * debian/patches/04-dbus_access.patch
-    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
-    - Remove bare send_interface directives to avoid non-deterministic allow
-      messages with no interface. Closes: #510757
-    - Do not allow unpriviledged processes to ask for a users' connections.
-    - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
-  * Updated SVN snapshot (r908338).
-  * debian/rules
-    - Stop moving icons around, fixed upstream.
-  * debian/patches/01-configure_package_name.patch
-    - Make sure we set the correct PACKAGE name when generating the build
-      system so the translations are installed properly.
-  * debian/network-manager-kde.lintian-overrides
-    - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
-  * debian/control
-    - Add Build-Depends on pkg-config.
-    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
-    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
-    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
-    - Bump Depends on network-manager to (>= 0.7.0).
-    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
-      new policy.
-  * debian/rules
-    - Install autostart desktop file into /usr/share/autostart/.
-    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
-      Closes: #487303
-    - Add support for both libtool 1.x and 2.x.
-  * Switch patch management system to quilt.
-  * debian/patches/04-dbus_access.patch
-    - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
-  * debian/patches/07-indicate_manual_config.patch
-    - manual-means-online: If there are interfaces that are not managed by
-      NetworkManager because they have custom configuration in
-      /etc/network/interfaces, we assume to be online and show a wired network
-      icon indicating manual network configuration.
-  * debian/control
-    - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Improved tray icon animation using mng files. Closes: #394815
-    - Improved LEAP security. Closes: #470709
-  * Removed patches
-    - debian/patches/01-fix_french_translation.patch (merged upstream)
-    - debian/patches/02-linux_types.patch (obsolete)
-    - debian/patches/03-awk_path.patch (fixed upstream)
-    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
-  * debian/knetworkmanager.linda
-    - Remove the linda override file, linda is dead.
-  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
-    - Rename the lintian override file so it is automatically installed by
-      dh_lintian.
-  * debian/rules
-    - Drop the no longer required install rules for the override files.
-    - Drop the install rule for the autostart file. It's provided by upstream
-      now.
-  * debian/copyright
-    - Update the authors list.
-  * debian/control
-    - Bump Build-Depends on libnl-dev (>= 1.1).
-    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
-      admin/ directory again.
-  * debian/watch
-    - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
-  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
-    authentication support.
-  * debian/rules
-    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
-      built twice in a row. Closes: #442621
-  * debian/control
-    - Add Build-Conflicts: autoconf2.13. Closes: #441046
-  * debian/menu
-    - Set section to Applications/Network/Monitoring which seems to be the
-      most appropriate amongst the available sections.
-  * debian/patches/05-desktop_file_fixes.patch
-    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
-      entry spec.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/05-leap_support.patch
-    - Removed, merged upstream.
-  * debian/patches/06-version_check.patch
-    - Removed, merged upstream.
-  * The upstream tarball does not ship an admin/ directory. Build-Depend on
-    kapptemplate, so we can copy it from there.
-  * debian/menu
-    - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
-  * debian/patches/06-version_check.patch
-    - Added. Fixes the problem with knetworkmanager no longer connecting
-      automatically upon login. Closes: #431255
-      If you are upgrading from a previous 0.2 svn snapshot, you may have to
-      clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
-  * debian/patches/02-linux_types.patch
-    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
-      in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
-  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
-    support. Closes: #415742
-  * debian/control
-    - Add XS-Vcs-* fields.
-    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
-  * debian/rules
-    - Compile with openvpn and vpnc support.
-
-  * Removed patches that were merged upstream:
-    - debian/patches/05-no_deserialize.patch
-    - debian/patches/06-pretty_notification.patch
-    - debian/patches/07-overlay_icon_vpn.patch
-    - debian/patches/08-disable_sm.patch
-    - debian/patches/09-dbus_bool_t.patch
-
-  * debian/patches/02-linux_types.patch
-    - Added. Needed to workaround a problem in libnl.
-  * debian/patches/03-awk_path.patch
-    - Added. In Debian awk is installed in /usr/bin.
-  * debian/patches/04-dbus_access.patch
-    - Do not remove the dbus at_console access check but make it an
-      alternative to the Debian netdev group policy. Closes: #426467
-  * debian/patches/05-leap_support.patch
-    - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
-  * Actually install the autostart file for knetworkmanager.
-    Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
-  * Pull some features and bug fixes from svn:
-    - debian/patches/05-no_deserialize.patch
-      + Don't call deserialize on encryption object to avoid warning of
-        libnm-util. Closes: #391486
-    - debian/patches/06-pretty_notification.patch
-      + Prettify notification messages.
-    - debian/patches/07-overlay_icon_vpn.patch
-      + Show overlay icon (lock) for active VPN connections.
-    - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing tdewallet.
-        Install an autostart file into /usr/share/autostart/ instead.
-        Closes: #406162
-    - debian/patches/09-dbus_bool_t.patch
-      + Use dbus_bool_t instead of bool. Closes: #398974
-  * debian/patches/01-fix_french_translation.patch
-    - Added patch from Emmanuel Bouthenot which fixes some errors in the
-      French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org. 
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
-  * Finally the 0.1 release. Woohoo!
-    - Use an epoch to fix the versioning scheme I managed to mess up.
-    - Fixes a crash when removing network objects for a nonexistent network
-      interface. Closes: #390052
-  * debian/patches/01-no_network_status.patch
-    - Removed, fixed upstream.
-  * debian/patches/03-configure.patch
-    - Removed, fixed upstream.
-  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
-    proper admin/ directory.
-  * debian/patches/02-dialup.patch
-    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
-      generate entries for /etc/network/interfaces yet. 
-
- -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
-  * Updated to svn revision 586773.
-  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
-    page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
-  * Updated to svn revision 577960.
-    - Access TDEWallet on demand, not on startup. Closes: #379606
-  * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
-  * Updated to svn revision 560817.
-  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
-  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
-    Closes: #379309, #379364
-  * Enabled dial up support. Set pppconfig as configuration utility.
-    Closes: #376071
-  * Reload D-Bus after installation. Closes: #379307
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
-  * Updated to svn revision 550737.
-  * Added 01-no_network_status.patch which removes a build dependency on
-    networkstatus.
-  * Removed 03-configure_notifications.patch, merged upstream.
-  * This version does not ship an admin/ directory. Added a build dependency
-    on kapptemplate and modified debian/rules to copy it from kapptemplate.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-  * Updated homepage URL.
-  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
-    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
-    their passwords.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed 01-xdg_app.patch, merged upstream.
-  * Added 03-configure_notifications.patch, this patch modifies the context
-    menu of the systray applet to provide quick access to the notification
-    settings.
-  * Added a "Provides: knetworkmanager" to make the package installable by its
-    upstream name.
-  * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
-
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
deleted file mode 100644
index c4f849687..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs,
- debhelper (>= 9~),
- pkg-config,
- tdelibs14-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- network-manager-dev (<< 0.8.9),
- libhal-dev,
- libdbus-1-tqt-dev,
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
-Replaces: network-manager-kde-kde3 (<< 4:14.0.0~), network-manager-kde-trinity (<< 4:14.0.0~)
-Breaks: network-manager-kde-kde3 (<< 4:14.0.0~), network-manager-kde-trinity (<< 4:14.0.0~)
-Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: TDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri,  3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors: 
-  Timo Hoenig <thoenig@suse.de>
-  Will Stephenson <wstephenson@suse.de>
-  Stefan Bogner <sbogner@suse.de>
-  Helmut Schaa <hschaa@suse.de>
-  Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright: 
-  Copyright (C) 2005, 2006 Novell, Inc.
-
-License:
-
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-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/applications/settings/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
deleted file mode 100644
index e4f5073db..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "Trinity Desktop Environment" "A NetworkManager front-end for TDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for TDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-A NetworkManager front-end for TDE
-.SH OPTIONS
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.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
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
deleted file mode 100644
index cc47df4d0..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde-trinity): \
-	needs="X11" \
-	section="Applications/Network/Monitoring" \
-  	title="KNetworkManager" \
-	longtitle="A TDE frontend for NetworkManager" \
-	command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index b5316fc73..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-  	# Ask D-Bus to reload the config file
-  	if [ -x "/etc/init.d/dbus" ]; then
-		invoke-rc.d dbus force-reload || true
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
deleted file mode 100755
index d38592f45..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-
-# Currently is not possible to build piklab with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
-include /usr/share/cdbs/1/rules/debhelper.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_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-binary-install/network-manager-kde-trinity::
-	# Install autostart file
-	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
-		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
-	mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
-	<debian-kde@lists.debian.org>	mailing list
-	#debian-kde			on irc
-
-Packaging queries
-	<debian-qt-kde@lists.debian.org>  mailing list
-	#debian-qt-kde			  on irc
-
-Maintainers
-	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
-
-
-2. Subversion repository
-------------------------
-  
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
-	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must 
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
-release is made.
-
-When, at some point, the need to have two different versions at the same time 
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and 
-if a new unstable package needs to be cooked, copying 
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-	
-	% svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-	
-	% svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
-	% svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
-	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're 
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is 
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
-        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive.  Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory.  The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/compat b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/compat
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
index ace8cb486..8b6b2db3e 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/control
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/control
@@ -4,26 +4,23 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, chrpath, tdelibs14-trinity-dev,
- libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
- python-support (>= 0.6) | dh-python, python-all, python-all-dev, x11proto-scrnsaver-dev, python-tqt-dev, hwdata
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ python3-setuptools, python3-sip-tqt-dev, libpythonize0-trinity-dev, pytde-dev
 Standards-Version: 3.8.4
 
 Package: tde-guidance-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, init | sysv-rc, guidance-backends-trinity, hwdata, python-all, python-all-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, guidance-backends-trinity, python3-all, python3-all-dev
 Replaces: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Description: collection of TDE system administration tools for GNU/Linux [Trinity]
- Guidance currently consists of four programs designed to help you
+ Guidance currently consists of three programs designed to help you
  look after your system:
   o  userconfig - User and Group administration
   o  serviceconfig - Service/daemon administration
   o  mountconfig - Disk and filesystem administration
-  o  wineconfig - Wine configuration
  .
  These tools are available in Trinity Control Center, System Settings 
  or can be run as standalone applications.
@@ -32,11 +29,11 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
 
 Package: guidance-backends-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python-all, python-all-dev
-Replaces: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
-Breaks: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-all, python3-all-dev
+Replaces: guidance-backends-trinity (<< 4:14.0.0~)
+Breaks: guidance-backends-trinity (<< 4:14.0.0~)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
  Guidance configuration tools.
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
index d292fc8d3..d9e850d6c 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
@@ -1,3 +1 @@
-opt/trinity/share/python-support/guidance-backends-trinity/MicroHAL.py
-opt/trinity/share/python-support/guidance-backends-trinity/wineread.py
-opt/trinity/share/python-support/guidance-backends-trinity/winewrite.py
+/usr/lib/python*/dist-packages/tde-guidance/MicroHAL.py
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
deleted file mode 100644
index d3076cc3c..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
+++ /dev/null
@@ -1,69 +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)
-.\" 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)
-.TH "MOUNTCONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-mountconfig \- disk and filesystem administration tool
-.SH "SYNOPSIS"
-.B mountconfig
-.RI [ options ]
-.br 
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B mountconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP 
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBmountconfig\fP is a disk and filesystem administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP 
-.B \-\-help
-Show summary of options.
-.TP 
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP 
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP 
-.B \-\-help\-all
-Show the complete help.
-.TP 
-.B \-\-author
-Show program author(s).
-.TP 
-.B \-v, \-\-version
-Show version of program.
-.TP 
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR serviceconfig (1),
-.BR userconfig (1).
-.br 
-.SH "AUTHOR"
-mountconfig was written by <simon@simonzone.com>.
-.PP 
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat b/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
deleted file mode 100644
index 1a1ec9a8e..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-#   This class is designed to work with Python packages using the
-#   'distutils' build system and comply to the new policy established
-#   during summer 2006.  Use of the debhelper class to make use of the
-#   new dh_python is strongly advised.  (This is still left as optional
-#   in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy.  Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior.  The pysupport and
-# pycentral methods are available to comply with new policy.  Don't forget
-# to update your 'debian/control'.  (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
-  ifeq (, $(cdbs_selected_pycompat))
-    cdbs_pycompat = 2
-  endif # use pycompat
-  # warning pysupport compatibility mode
-  ifneq (, $(cdbs_use_xs_field))
-    $(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
-  endif # use XS field (compat)
-else
-  ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
-    ifeq (, $(cdbs_selected_pycompat))
-      cdbs_pycompat = 2
-    endif # use pycompat
-  else
-    ifneq (, $(DEB_PYTHON_SYSTEM))
-      $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
-    else
-      ifneq (, $(cdbs_use_xs_field))
-        $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-      endif
-      ifneq (, $(cdbs_selected_pycompat))
-        ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
-          $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-        endif
-      endif # use pycompat
-    endif # unknown method
-  endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION = 
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr 
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating.  Here is some documentation:)
-$(warning   http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning   http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'.  Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-	for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command.  Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule.  In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
-	-python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : 
-	-python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
-  # check if current is in build versions
-  ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
-    cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
-    cdbs_python_build_versions := $(cdbs_python_compile_version)
-  else
-    cdbs_python_build_versions := $(cdbs_python_current_version)
-  endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
-  ifneq (, $(cdbs_python_compile_version))
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
-  else
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
-  endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
-	touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# This class can optionally use debhelper's commands.  Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-	dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-else
-	dh_pycentral -p$(cdbs_curpkg)
-endif
-	${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
-	echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
-	rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
-	find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions b/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions
deleted file mode 100644
index b3dc41ebc..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
index 28dfb8c47..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
@@ -1,170 +1,16 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
-PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
-GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
-export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  include debian/python-distutils-jaunty.mk
-else
-  include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_UPDATE_RCD_PARAMS := multiuser
-DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-LDFLAGS_APPEND := -L/opt/trinity/lib
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-post-patches::
-	# make sure that python binary exists
-	# since the existing code is still dependent on python2
-	# and cdbs uses python as the default binary name
-	test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-install/tde-guidance-trinity::
-	# install icons to right place
-	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
-	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kcmpartitions.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
-	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-user.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/32-wine.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
-	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/daemons.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
-	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
-	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/userconfig.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
-	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
-
-	# install lintian overrides
-	install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \
-		$(DEB_DESTDIR)/usr/share/lintian/overrides/tde-guidance-trinity
-
-	# fix binary-or-shlib-defines-rpath
-	chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so*
-
-	# fix executable-not-elf-or-script
-	chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-
-	# fix the link properly
-	mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
-#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
-
-	# move python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-#	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-
-        # fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/fuser.py
-#	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/grubconfig.py
-
-	: # Replace all '#!' calls to python with /usr/bin/python
-	: # and make them executable
-	for i in `find debian/tde-guidance-trinity -type f`; do \
-		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-			$$i > $$i.temp; \
-		if cmp --quiet $$i $$i.temp; then \
-			rm -f $$i.temp; \
-		else \
-			mv -f $$i.temp $$i; \
-			chmod 755 $$i; \
-			echo "fixed interpreter: $$i"; \
-		fi; \
-	done
-
-install/guidance-backends-trinity::
-	mkdir -p $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-
-clean::
-	rm -rf build
-
-	rm -rf doc/en/*html doc/en/*bz2
-	rm -f serviceconfig/kcm_serviceconfig.cpp
-	rm -f mountconfig/kcm_mountconfig.cpp
-	rm -f displayconfig/kcm_displayconfig.cpp
-	rm -f userconfig/kcm_userconfig.cpp
-	rm -f install_log.txt
-	rm -f po/*.gmo
-	rm -f po/*.pot
-
-	# clean up edited .desktop etc files
-	if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
-		sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
-		for file in `cat LIST`; do \
-			sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \
-		done; \
-		rm -f LIST; \
-	fi
-
-common-install-prehook-impl::
-	# generate form implementation using pytde user interface compiler
-
-	mkdir -p po
-	touch list
-	find -name "*.py" >> list
-	xgettext -ki18n -LPython -flist -o po/guidance.pot
-	rm list
-
-	for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-	# generate .po files for .desktop etc files
-	if [ -z $${KUBUNTU_DESKTOP_POT} ]; then \
-		KUBUNTU_DESKTOP_POT=$(DEB_SOURCE_PACKAGE); \
-	fi; \
-	echo KUBUNTU_DESKTOP_POT: $${KUBUNTU_DESKTOP_POT}; \
-	if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
-		sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
-		cat LIST; \
-		perl /usr/lib/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
-		msguniq --to-code=UTF-8 --no-wrap -o desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null; \
-		python /usr/lib/kubuntu-desktop-i18n/msgsplit desktop.$${KUBUNTU_DESKTOP_POT}; \
-		mv desktop.$${KUBUNTU_DESKTOP_POT} po/desktop_$${KUBUNTU_DESKTOP_POT}.pot; \
-		rm -f desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
-		# add translation domain to files \
-		for file in `cat LIST`; do \
-			echo X-Ubuntu-Gettext-Domain=desktop_$${KUBUNTU_DESKTOP_POT} >> $${file}; \
-		done; \
-		rm -f LIST; \
-	fi
-
-	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
deleted file mode 100644
index 8ef180de8..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
+++ /dev/null
@@ -1,69 +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)
-.\" 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)
-.TH "SERVICECONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-serviceconfig \- Service/daemon administration tool
-.SH "SYNOPSIS"
-.B serviceconfig
-.RI [ options ]
-.br 
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B serviceconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP 
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBserviceconfig\fP is a service/daemon administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP 
-.B \-\-help
-Show summary of options.
-.TP 
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP 
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP 
-.B \-\-help\-all
-Show the complete help.
-.TP 
-.B \-\-author
-Show program author(s).
-.TP 
-.B \-v, \-\-version
-Show version of program.
-.TP 
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR mountconfig (1),
-.BR userconfig (1).
-.br 
-.SH "AUTHOR"
-serviceconfig was written by <simon@simonzone.com>.
-.PP 
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
index 724e08449..ca0272abf 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
@@ -1,2 +1,3 @@
+AUTHORS
 README
 TODO
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
index e6a81f4d4..d39b3faac 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,68 +1,16 @@
-opt/trinity/lib/trinity/kcm_serviceconfig.la
-opt/trinity/lib/trinity/kcm_userconfig.la
-opt/trinity/lib/trinity/kcm_mountconfig.la
-opt/trinity/lib/trinity/kcm_wineconfig.la
-opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
-opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
-opt/trinity/share/doc/tde/HTML/en/guidance/index.html
-opt/trinity/share/applications/tde/serviceconfig.desktop
-opt/trinity/share/applications/tde/userconfig.desktop
-opt/trinity/share/applications/tde/mountconfig.desktop
-opt/trinity/share/applications/tde/wineconfig.desktop
-opt/trinity/share/apps/guidance/pics/laserwarn.png
-opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
-opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
-opt/trinity/share/apps/guidance/pics/hi32-user.png
-opt/trinity/share/apps/guidance/pics/hi32-group.png
-opt/trinity/share/apps/guidance/pics/hi32-identity.png
-opt/trinity/share/apps/guidance/pics/hi32-password.png
-opt/trinity/share/apps/guidance/pics/kcmpartitions.png
-opt/trinity/share/apps/guidance/pics/trinity1.png
-opt/trinity/share/apps/guidance/pics/trinity2.png
-opt/trinity/share/apps/guidance/pics/trinity3.png
-opt/trinity/share/apps/guidance/pics/trinity4.png
-opt/trinity/share/apps/guidance/pics/trinity5.png
-opt/trinity/share/apps/guidance/pics/trinity6.png
-opt/trinity/share/apps/guidance/pics/hi32-samba.png
-opt/trinity/share/apps/guidance/pics/hi16-hdd.png
-opt/trinity/share/apps/guidance/pics/hi16-cdrom.png
-opt/trinity/share/apps/guidance/pics/hi16-burner.png
-opt/trinity/share/apps/guidance/pics/hi16-floppy.png
-opt/trinity/share/apps/guidance/pics/hi16-blockdevice.png
-opt/trinity/share/apps/guidance/pics/hi16-password.png
-opt/trinity/share/apps/guidance/pics/hi16-memory.png
-opt/trinity/share/apps/guidance/pics/hi16-network.png
-opt/trinity/share/apps/guidance/pics/hi16-lock.png
-opt/trinity/share/apps/guidance/pics/hi16-usbpen.png
-opt/trinity/share/apps/guidance/pics/greenled.png
-opt/trinity/share/apps/guidance/pics/greyled.png
-opt/trinity/share/apps/guidance/pics/exec.png
-opt/trinity/share/apps/guidance/pics/file.png
-opt/trinity/share/apps/guidance/pics/important.png
-opt/trinity/share/apps/guidance/pics/tux.png
-opt/trinity/share/apps/guidance/pics/user.png
-opt/trinity/share/apps/guidance/pics/32-wine.png
-opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-opt/trinity/share/python-support/tde-guidance-trinity/SMBShareSelectDialog.py
-opt/trinity/share/python-support/tde-guidance-trinity/SimpleCommandRunner.py
-opt/trinity/share/python-support/tde-guidance-trinity/fuser.py
-opt/trinity/share/python-support/tde-guidance-trinity/fuser_ui.py
-#opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
-opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
-opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
-opt/trinity/lib/trinity/kcm_serviceconfig.so
-opt/trinity/lib/trinity/kcm_userconfig.so
-opt/trinity/lib/trinity/kcm_mountconfig.so
-opt/trinity/lib/trinity/kcm_wineconfig.so
-usr/share/lintian/overrides/tde-guidance-trinity
+opt/trinity/bin
+opt/trinity/lib/trinity
+opt/trinity/share/applications/tde
+opt/trinity/share/apps/guidance/pics
+opt/trinity/share/doc
+opt/trinity/share/icons/crystalsvg
+opt/trinity/share/man/man1
+usr/lib/python*/dist-packages/tde-guidance/SMBShareSelectDialog.py
+usr/lib/python*/dist-packages/tde-guidance/SimpleCommandRunner.py
+usr/lib/python*/dist-packages/tde-guidance/fuser.py
+usr/lib/python*/dist-packages/tde-guidance/fuser_ui.py
+usr/lib/python*/dist-packages/tde-guidance/mountconfig.py
+usr/lib/python*/dist-packages/tde-guidance/serviceconfig.py
+usr/lib/python*/dist-packages/tde-guidance/sizeview.py
+usr/lib/python*/dist-packages/tde-guidance/unixauthdb.py
+usr/lib/python*/dist-packages/tde-guidance/userconfig.py
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
index f151ee69f..e83480662 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
@@ -1,4 +1,2 @@
 # false positive warnings from lintian
-tde-guidance-trinity: postinst-has-useless-call-to-ldconfig
-tde-guidance-trinity: postrm-has-useless-call-to-ldconfig
 tde-guidance-trinity: package-has-a-duplicate-relation depends
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
deleted file mode 100644
index af8e365b5..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Remove shutdown and reboot links; this init script does not need them.
-rm -f /etc/rc0.d/K20tde-guidance /etc/rc6.d/K20tde-guidance
-
-#remove script from older times
-update-rc.d -f displayconfig-hwprobe.py remove
-
-#DEBHELPER#
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
deleted file mode 100644
index 1fda3dd19..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
+++ /dev/null
@@ -1,69 +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)
-.\" 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)
-.TH "USERCONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-userconfig \- user and group administration tool
-.SH "SYNOPSIS"
-.B userconfig
-.RI [ options ]
-.br 
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B userconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP 
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBuserconfig\fP is an user and group administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP 
-.B \-\-help
-Show summary of options.
-.TP 
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP 
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP 
-.B \-\-help\-all
-Show the complete help.
-.TP 
-.B \-\-author
-Show program author(s).
-.TP 
-.B \-v, \-\-version
-Show version of program.
-.TP 
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR mountconfig (1),
-.BR serviceconfig (1).
-.br 
-.SH "AUTHOR"
-userconfig was written by <simon@simonzone.com>.
-.PP 
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/watch b/ubuntu/_base/applications/settings/tde-guidance/debian/watch
deleted file mode 100644
index 19912c171..000000000
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
index 0da5ee76a..e34f884e3 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tde-systemsettings-trinity
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
index 087bcaaa1..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
@@ -1,5 +1,3 @@
-AUTHOR
-README
-
-
-
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/changelog b/ubuntu/_base/applications/settings/tdealternatives/debian/changelog
new file mode 100644
index 000000000..2627e8ce5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/changelog
@@ -0,0 +1,5 @@
+tdealternatives-trinity (0.10-0) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 30 Mar 2025 22:46:00 +0900
diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/compat b/ubuntu/_base/applications/settings/tdealternatives/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/control b/ubuntu/_base/applications/settings/tdealternatives/debian/control
new file mode 100644
index 000000000..2c24baf43
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/control
@@ -0,0 +1,12 @@
+Source: tdealternatives-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+
+Package: tdealternatives-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A TDE control module to manage Mandrake/Debian alternative programs
+ TDEAlternatives is a TDE program that allows you to easily configure and
+ change your Mandrake/Debian alternatives system. 
diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/copyright b/ubuntu/_base/applications/settings/tdealternatives/debian/copyright
new file mode 100644
index 000000000..f4d5ca236
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/copyright
@@ -0,0 +1,9 @@
+This code was ported to TDE by:
+    Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+    Juanjo Alvarez <juanjo@juanjoalvarez.net>
+    Mario Bensi <nef@ipsquad.net>
+    Pino Toscano <toscano.pino@tiscali.it>
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/settings/tdealternatives/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/rules b/ubuntu/_base/applications/settings/tdealternatives/debian/rules
new file mode 100755
index 000000000..ed53a5baa
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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" \
+ -DWITH_DISTRIBUTION_DPKG="ON"
diff --git a/ubuntu/_base/common/cmake/debian/source/format b/ubuntu/_base/applications/settings/tdealternatives/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/common/cmake/debian/source/format
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/source/format
diff --git a/ubuntu/_base/common/cmake/debian/source/options b/ubuntu/_base/applications/settings/tdealternatives/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/common/cmake/debian/source/options
+++ b/ubuntu/_base/applications/settings/tdealternatives/debian/source/options
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
index 6ab8cc8fc..0f8d9eb2e 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
@@ -2,8 +2,8 @@ Source: tdenetworkmanager-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
- cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt,
+ tde-cmake, ninja-build,
  tdelibs14-trinity-dev,
  libiw-dev,
  libnl-3-dev | libnl-dev (>= 1.1)
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..93aadf394 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
@@ -1,5 +1,3 @@
 network-manager-tde: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdenetworkmanager.so
 network-manager-tde: package-name-doesnt-match-sonames libtdeinit-tdenetworkmanager
-network-manager-tde: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
-network-manager-tde: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
 
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
deleted file mode 100644
index df7b9dba2..000000000
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postinst script for network-manager-tde
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/compat b/ubuntu/_base/applications/settings/tdesudo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/compat
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/control b/ubuntu/_base/applications/settings/tdesudo/debian/control
index 0742eb9dd..2a74e9d35 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/control
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/control
@@ -2,7 +2,7 @@ Source: tdesudo-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdesudo-trinity
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/docs
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/rules b/ubuntu/_base/applications/settings/tdesudo/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/settings/tdesudo/debian/rules
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/compat
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control
index f1908c8ab..304d84da0 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/control
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/rules b/ubuntu/_base/applications/settings/wlassistant/debian/rules
index b9e54f6a9..a9217b088 100755
--- a/ubuntu/_base/applications/settings/wlassistant/debian/rules
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..960f99591 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -1,4 +1,4 @@
-doc/AUTHORS
-doc/NEWS
-doc/README
-doc/TODO
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/dolphin/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/dolphin/debian/compat
+++ b/ubuntu/_base/applications/system/dolphin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control
index a6b83f6dd..30fb005fb 100644
--- a/ubuntu/_base/applications/system/dolphin/debian/control
+++ b/ubuntu/_base/applications/system/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: dolphin-trinity
diff --git a/ubuntu/_base/applications/system/dolphin/debian/docs b/ubuntu/_base/applications/system/dolphin/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/dolphin/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/dolphin/debian/rules b/ubuntu/_base/applications/system/dolphin/debian/rules
index ec74e914d..700c81956 100755
--- a/ubuntu/_base/applications/system/dolphin/debian/rules
+++ b/ubuntu/_base/applications/system/dolphin/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/katapult/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/katapult/debian/compat
+++ b/ubuntu/_base/applications/system/katapult/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control
index 5583560d3..d0b636ec8 100644
--- a/ubuntu/_base/applications/system/katapult/debian/control
+++ b/ubuntu/_base/applications/system/katapult/debian/control
@@ -2,7 +2,7 @@ Source: katapult-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxi-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev
 Standards-Version: 3.8.4
 
 Package: katapult-trinity
diff --git a/ubuntu/_base/applications/system/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs
index 777273e59..a2b373b4d 100644
--- a/ubuntu/_base/applications/system/katapult/debian/docs
+++ b/ubuntu/_base/applications/system/katapult/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 
diff --git a/ubuntu/_base/applications/system/katapult/debian/rules b/ubuntu/_base/applications/system/katapult/debian/rules
index 74e4fb499..e43332172 100755
--- a/ubuntu/_base/applications/system/katapult/debian/rules
+++ b/ubuntu/_base/applications/system/katapult/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kbfx/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kbfx/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kbfx/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kbfx/debian/compat b/ubuntu/_base/applications/system/kbfx/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kbfx/debian/compat
+++ b/ubuntu/_base/applications/system/kbfx/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control
index e82ef297c..013b1802a 100644
--- a/ubuntu/_base/applications/system/kbfx/debian/control
+++ b/ubuntu/_base/applications/system/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbfx-trinity
diff --git a/ubuntu/_base/applications/system/kbfx/debian/postinst b/ubuntu/_base/applications/system/kbfx/debian/postinst
deleted file mode 100644
index e95a6906b..000000000
--- a/ubuntu/_base/applications/system/kbfx/debian/postinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# postinst script for kbfx
-
-set -e
-
-case "$1" in
-    configure)
-        ldconfig
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/ubuntu/_base/applications/system/kbfx/debian/rules b/ubuntu/_base/applications/system/kbfx/debian/rules
index bb4d9b898..585b34d75 100755
--- a/ubuntu/_base/applications/system/kbfx/debian/rules
+++ b/ubuntu/_base/applications/system/kbfx/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS =\
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/compat b/ubuntu/_base/applications/system/kcmautostart/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/compat
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/control b/ubuntu/_base/applications/system/kcmautostart/debian/control
index 32c10296f..9d3a028c8 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/control
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-autostart-trinity
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/docs b/ubuntu/_base/applications/system/kcmautostart/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/docs
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/rules b/ubuntu/_base/applications/system/kcmautostart/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/kcmautostart/debian/rules
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/compat b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/compat
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control
index e5e6d5469..9d1588fb3 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/control
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: kdbusnotification-trinity
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/docs b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/docs
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/rules b/ubuntu/_base/applications/system/kdbusnotification/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/rules
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/klamav/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/klamav/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/klamav/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/klamav/debian/compat b/ubuntu/_base/applications/system/klamav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/klamav/debian/compat
+++ b/ubuntu/_base/applications/system/klamav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/klamav/debian/control b/ubuntu/_base/applications/system/klamav/debian/control
index 6e37ec7ee..17c7c4669 100644
--- a/ubuntu/_base/applications/system/klamav/debian/control
+++ b/ubuntu/_base/applications/system/klamav/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Scott Kitterman <scott@kitterman.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~)
 Standards-Version: 3.8.4
 
 Package: klamav-trinity
diff --git a/ubuntu/_base/applications/system/klamav/debian/docs b/ubuntu/_base/applications/system/klamav/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/klamav/debian/docs
+++ b/ubuntu/_base/applications/system/klamav/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/klamav/debian/rules b/ubuntu/_base/applications/system/klamav/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/klamav/debian/rules
+++ b/ubuntu/_base/applications/system/klamav/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/knemo/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knemo/debian/compat
+++ b/ubuntu/_base/applications/system/knemo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control
index 447402a7d..63fab90de 100644
--- a/ubuntu/_base/applications/system/knemo/debian/control
+++ b/ubuntu/_base/applications/system/knemo/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libiw-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev
 Standards-Version: 3.8.4
 
 Package: knemo-trinity
diff --git a/ubuntu/_base/applications/system/knemo/debian/docs b/ubuntu/_base/applications/system/knemo/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/system/knemo/debian/docs
+++ b/ubuntu/_base/applications/system/knemo/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/system/knemo/debian/rules b/ubuntu/_base/applications/system/knemo/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/knemo/debian/rules
+++ b/ubuntu/_base/applications/system/knemo/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/knetload/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knetload/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/knetload/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/knetload/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knetload/debian/compat
+++ b/ubuntu/_base/applications/system/knetload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control
index e1286fc48..ab1339d39 100644
--- a/ubuntu/_base/applications/system/knetload/debian/control
+++ b/ubuntu/_base/applications/system/knetload/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
 Standards-Version: 3.8.4
 
 Package: knetload-trinity
diff --git a/ubuntu/_base/applications/system/knetload/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/system/knetload/debian/docs
+++ b/ubuntu/_base/applications/system/knetload/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/system/knetload/debian/patches/series b/ubuntu/_base/applications/system/knetload/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/system/knetload/debian/patches/series
+++ b/ubuntu/_base/applications/system/knetload/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/system/knetload/debian/rules b/ubuntu/_base/applications/system/knetload/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/knetload/debian/rules
+++ b/ubuntu/_base/applications/system/knetload/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/knetstats/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/compat
+++ b/ubuntu/_base/applications/system/knetstats/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control
index ae8580131..dea9f21e8 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/control
+++ b/ubuntu/_base/applications/system/knetstats/debian/control
@@ -2,7 +2,7 @@ Source: knetstats-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knetstats.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/system/knetstats/debian/docs b/ubuntu/_base/applications/system/knetstats/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/docs
+++ b/ubuntu/_base/applications/system/knetstats/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/knetstats/debian/rules b/ubuntu/_base/applications/system/knetstats/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/knetstats/debian/rules
+++ b/ubuntu/_base/applications/system/knetstats/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kooldock/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kooldock/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kooldock/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kooldock/debian/compat b/ubuntu/_base/applications/system/kooldock/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/compat
+++ b/ubuntu/_base/applications/system/kooldock/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kooldock/debian/control b/ubuntu/_base/applications/system/kooldock/debian/control
index 9af925609..2034a30e1 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/control
+++ b/ubuntu/_base/applications/system/kooldock/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.0
 Homepage: http://sourceforge.net/projects/kooldock/
 
diff --git a/ubuntu/_base/applications/system/kooldock/debian/docs b/ubuntu/_base/applications/system/kooldock/debian/docs
index c17f03764..76c3076c9 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/docs
+++ b/ubuntu/_base/applications/system/kooldock/debian/docs
@@ -1,4 +1,3 @@
 AUTHORS
-NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/system/kooldock/debian/rules b/ubuntu/_base/applications/system/kooldock/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/kooldock/debian/rules
+++ b/ubuntu/_base/applications/system/kooldock/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/changelog b/ubuntu/_base/applications/system/kpowersave/debian/changelog
deleted file mode 100644
index 555de82cf..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/changelog
+++ /dev/null
@@ -1,372 +0,0 @@
-kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 14 Dec 2008 15:12:00 -0600
-
-kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-    - Modified maintainer field per specification
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 25 Jan 2008 09:54:46 +0000
-
-kpowersave (0.7.3-2) unstable; urgency=low
-
-  * debian/control
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support.
-      Let the hal package depend on the correct suspend framework.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 06:02:09 +0100
-
-kpowersave (0.7.3-1ubuntu1) hardy; urgency=low
-
-  * Merge from debian unstable.
-  * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class.
-  * Remaining Ubuntu changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-
- -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Wed, 24 Oct 2007 20:41:44 +0200
-
-kpowersave (0.7.3-1) unstable; urgency=low
-
-  * New upstream release.
-    - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy ().
-      Closes: #422057
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - Add a Build-Conflicts against autoconf2.13.
-  * debian/menu
-    - Update to the new menu spec.
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Removed, fixed upstream.
-  * debian/patches/06-handle_failed_suspend.patch
-    - Removed, merged upstream.
-  * debian/patches/05-restore_window.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Updated, wodim is now already in the application blacklist that is
-      provided by upstream.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 04 Oct 2007 12:48:39 +0200
-
-kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low
-
-  * Merge from debian unstable. 
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 13:22:26 +1000
-
-kpowersave (0.7.2-3) unstable; urgency=low
-
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Fixes a crash when the environment variable DESKTOP_SESSION is not set.
-      Patch by Pierre Habouzit, thanks!  Closes: #422420
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 21:07:05 +0200
-
-kpowersave (0.7.2-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * debian/patches/05-restore_window.patch
-    - Pull from svn. Properly restore minimized configuration dialog.
-      Closes: #413638
-  * debian/patches/06-handle_failed_suspend.patch
-    - Pull from svn. Check the return code of the Suspend() method and display
-      a message box if it failed. Closes: #413811
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 20:40:41 +0200
-
-kpowersave (0.7.2-1ubuntu1) feisty; urgency=low
-
-  * Merge from debian experimental
-  * Dropped Ubuntu changes:
-    * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not
-      conflict anymore
-    * debian/rules: remove dh_iconcache - done by cdbs
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Luka Renko <lure@ubuntu.com>  Mon, 19 Mar 2007 22:30:13 +0100
-
-kpowersave (0.7.2-1) experimental; urgency=low
-
-  * New upstream release. Closes: #412647
-  * debian/patches/01-autoconf_2.6.patch,
-    debian/patches/02-close_dialog_on_destroy.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Add wodim to application blacklist.
-    - Do not unmount external media on suspend.
-      kded/mediamanager in Debian is missing a patch which would allow that. 
-  * Beginning with this version, the dependency on powersaved as backend has
-    been dropped. All the heavy lifting is done via HAL now.
-    Update debian/control accordingly:
-    - Remove build dependency on libpowersave-dev.
-    - Remove dependency on powersaved, add a versioned dependency on 
-      hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support).
-    - For proper suspend/resume support, hal should use one of the existing 
-      suspend frameworks. Add Recommends on these packages. 
-    - Update the package description.
-
- -- Michael Biebl <biebl@debian.org>  Mon,  5 Mar 2007 07:24:09 +0100
-
-kpowersave (0.7.2-0ubuntu1) feisty; urgency=low
-
-  * New upstream release: uses HAL directly (no powersave dependency)
-  * Changes:
-    * drop 01-autoconf_2.6.patch: included upstream
-    * drop 02-close_dialog_on_destroy.patch: included upstream
-    * drop 03-reset_blankonly_to_default.patch: fixed upstream
-    * update kubuntu_01_kdepot.patch to apply
-    * drop Build-Depends on libpowersave-dev: now uses HAL 
-    * drop Depends on powersaved: now uses HAL
-    * update Maintainer field
-  * UVF exception approved by MOTU https://launchpad.net/bugs/88793
-
- -- Luka Renko <lure@ubuntu.com>  Wed, 28 Feb 2007 22:35:46 +0100
-
-kpowersave (0.6.2-5ubuntu1) feisty; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - Added dh_iconcache
-    - Add kubuntu_02_messages_target.diff fix messages 
-      target for .pot generation
-    - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-    - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce 
-      its removal. 
-
- -- ville palo <vi64pa@gmail.com>  Sun, 21 Jan 2007 09:21:00 +0000
-
-kpowersave (0.6.2-5) unstable; urgency=low
-
-  * Prepend a sequence number to all patches.
-  * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset tdescreensaver settings to correct default values on scheme 
-      changes and on application shutdown.
-      Patch by Modestas Vainius, thanks! Closes: #399473
-
- -- Michael Biebl <biebl@debian.org>  Sat, 20 Jan 2007 19:49:40 +0100
-
-kpowersave (0.6.2-4) unstable; urgency=low
-
-  * debian/patches/close_dialog_on_destroy.patch
-    - Added. Correctly close the information dialog when activated over dcop.
-      Closes: #398201
-
- -- Michael Biebl <biebl@debian.org>  Mon, 13 Nov 2006 06:05:56 +0100
-
-kpowersave (0.6.2-3) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:04:12 +0200
-
-kpowersave (0.6.2-2ubuntu2) edgy; urgency=low
-
-  * Rebuild against dbus 0.90
-
- -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 22:04:58 +0200
-
-kpowersave (0.6.2-2ubuntu1) edgy; urgency=low
-
-  * Merge from debian unstable.
-
- -- Luka Renko <lure@ubuntu.com>  Sat, 12 Aug 2006 17:17:17 +0200
-
-kpowersave (0.6.2-2) unstable; urgency=medium
-
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:10:10 +0200
-
-kpowersave (0.6.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Display correct warning message if user lacks permissions to connect to
-      powersaved over dbus. Closes: #356609
-  * Requires powersave 0.12.8 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Sat, 24 Jun 2006 19:16:02 +0200
-
-kpowersave (0.6.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Corrected typo in package description. Closes: #364191
-  * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 15 May 2006 02:28:48 +0200
-
-kpowersave (0.6.0-1ubuntu4) dapper; urgency=low
-
-  * Added dh_iconcache
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 13 May 2006 20:16:04 +1000
-
-kpowersave (0.6.0-1ubuntu3) dapper; urgency=low
-
-  * Add kubuntu_02_messages_target.diff fix messages 
-    target for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:03:01 +0000
-
-kpowersave (0.6.0-1ubuntu2) dapper; urgency=low
-
-  * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 13 Apr 2006 00:40:57 +0200
-
-kpowersave (0.6.0-1ubuntu1) dapper; urgency=low
-
-  * Added kpowersave-fix-utf8_in_eventrc.diff
-
- -- Luka Renko <lure.net@gmail.com>  Wed, 12 Apr 2006 19:39:57 +0200
-
-kpowersave (0.6.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.7 or newer.
-  * Added build dependency on libxtst-dev.
-  * Added kpowersave-fix-utf8_in_eventrc.diff. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 17 Apr 2006 18:21:14 +0200
-
-kpowersave (0.5.11-1ubuntu1) dapper; urgency=low
-
-  * New upstream release.
-
- -- Luka Renko <lure.net@gmail.com>  Sun, 26 Mar 2006 18:59:38 +0200
-
-kpowersave (0.5.11-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 23 Mar 2006 09:45:35 +0100
-
-kpowersave (0.5.10-1ubuntu1) dapper; urgency=low
-
-  * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal. 
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  9 Mar 2006 23:05:33 +0100
-
-kpowersave (0.5.10-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.2 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Mar 2006 23:45:01 +0100
-
-kpowersave (0.5.9-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.1 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  2 Mar 2006 18:43:24 +0100
-
-kpowersave (0.5.8-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bumped debhelper compatibility to 5.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 21 Feb 2006 10:51:35 +0100
-
-kpowersave (0.5.7-1) unstable; urgency=low
-
-  * New upstream release.
-    - kpowersave now shows correct instructions how to start the powersaved
-      daemon. Closes: #352218
-    - Layout problem in the information dialog has been fixed. Closes: #352684 
-  * Corrected formatting of the homepage url in the long description.
-  
- -- Michael Biebl <biebl@teco.edu>  Tue, 14 Feb 2006 23:27:37 +0100
-
-kpowersave (0.5.6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 02:51:39 +0100
-
-kpowersave (0.5.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed build dependency on libcpufreq-dev as it is now correctly handled
-    by libpowersave-dev.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 31 Jan 2006 01:32:36 +0100
-
-kpowersave (0.5.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 23 Jan 2006 23:14:39 +0100
-
-kpowersave (0.5.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.11.5 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 18 Jan 2006 05:10:26 +0100
-
-kpowersave (0.5.2-1ubuntu1) dapper; urgency=low
-
-  * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting
-    automatically in GNOME (Closes: Malone #32340).
-
- -- Raphaël Pinson <raphink@ubuntu.com>  Sat,  4 Mar 2006 17:22:09 +0100
-
-kpowersave (0.5.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed patches absolute_build_path_fix.diff and sound_files_path.diff,
-    fixed upstream.
-  * Tightened dependencies on powersave, version 0.11.2 or newer is required.
-  * Use Debian libtool and regenerate the autotools files.
-    + Added build dependencies to automake1.9, autoconf and libtool.
-  * hal and dbus are now mandatory. Added the corresponding build
-    dependencies.
-  * Removed the build dependency on libqt3-compat-headers. Package has been
-    fixed upstream to compile cleanly without it. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 16 Jan 2006 02:02:45 +0100
-
-kpowersave (0.5.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * This release was not uploaded to unstable.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 10 Jan 2006 02:25:11 +0100
-
-kpowersave (0.4.5-2) unstable; urgency=low
-
-  * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with
-    powersaved (>= 0.10). 
-
- -- Michael Biebl <biebl@teco.edu>  Sun,  8 Jan 2006 18:00:08 +0100
-
-kpowersave (0.4.5-1) unstable; urgency=low
-
-  * Initial release. Closes: #329922
-
- -- Michael Biebl <biebl@teco.edu>  Wed,  9 Nov 2005 00:53:24 +0100
-
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/compat b/ubuntu/_base/applications/system/kpowersave/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/control b/ubuntu/_base/applications/system/kpowersave/debian/control
deleted file mode 100644
index b69ba98ed..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: kpowersave-trinity
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Replaces: kpowersave-kde3 (<< 4:14.0.0~), kpowersave-trinity (<< 4:14.0.0~)
-Breaks: kpowersave-kde3 (<< 4:14.0.0~), kpowersave-trinity (<< 4:14.0.0~)
-Description: HAL based power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
- management settings and policies of your computer.
- It relies on HAL to do the heavy lifting.
- .
- Current feature list:
-  * support for ACPI, APM and PMU
-  * trigger suspend to disk/ram and standby
-  * switch cpu frequency policy (between: performance, dynamic and powersave)
-  * applet icon with information about AC state, battery fill and battery
-    (warning) states
-  * applet tooltip with information about battery fill and remaining battery 
-    time/percentage
-  * autosuspend (to suspend the machine if the user has been inactive for a 
-    defined time)
-  * a global configurable blacklist with programs which prevent autosuspend
-    (e.g. videoplayer and cd burning tools)
-  * trigger lock screen and select the lock method
-  * KNotify support
-  * online help
-  * localisations for many languages
- KPowersave supports schemes with following configurable specific 
- settings for:
-  * screensaver
-  * DPMS
-  * autosuspend
-  * scheme specific blacklist for autosuspend
-  * notification settings
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/copyright b/ubuntu/_base/applications/system/kpowersave/debian/copyright
deleted file mode 100644
index a1557e62e..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Sun, 25 Sep 2005 01:12:21 +0200.
-
-It was downloaded from http://sourceforge.net/projects/powersave/
-
-Copyright Holders: 
-  Danny Kukawka <dkukawka@suse.de>
-  Thomas Renninger <trenn@suse.de>
-
-License:
-
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-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/applications/system/kpowersave/debian/install b/ubuntu/_base/applications/system/kpowersave/debian/install
deleted file mode 100644
index 7b00dd534..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
deleted file mode 100644
index 35bdc35cd..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /opt/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
deleted file mode 100644
index 8f6135226..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-"  	c None",
-". 	c #6D2121",
-"+ 	c #783738",
-"@ 	c #743E40",
-"# 	c #5D2F30",
-"$ 	c #3E1618",
-"% 	c #8A0200",
-"& 	c #982306",
-"* 	c #A75C4B",
-"= 	c #D3B8BC",
-"- 	c #E9E0E1",
-"; 	c #E7E7ED",
-"> 	c #DDDFE7",
-", 	c #CCCBD7",
-"' 	c #B3ADBB",
-") 	c #827583",
-"! 	c #6A3227",
-"~ 	c #410B00",
-"{ 	c #080000",
-"] 	c #AE381A",
-"^ 	c #C79676",
-"/ 	c #D8C9B7",
-"( 	c #B3B7C2",
-"_ 	c #F2F8FF",
-": 	c #EBEDF4",
-"< 	c #D8D9E3",
-"[ 	c #CBCBD8",
-"} 	c #BEC0CF",
-"| 	c #B4B5C9",
-"1 	c #A0A4BD",
-"2 	c #9B90A1",
-"3 	c #B08583",
-"4 	c #8F493D",
-"5 	c #340B02",
-"6 	c #A71F09",
-"7 	c #D5BEA2",
-"8 	c #F1FFFF",
-"9 	c #EEF2F6",
-"0 	c #999AAD",
-"a 	c #C8C8D7",
-"b 	c #CFCFDB",
-"c 	c #C2C2D0",
-"d 	c #B6B6C6",
-"e 	c #A8A8BC",
-"f 	c #9B9BB1",
-"g 	c #8685A0",
-"h 	c #8D8EA6",
-"i 	c #AFB8CD",
-"j 	c #ABAFC6",
-"k 	c #9F534D",
-"l 	c #1C0000",
-"m 	c #B63F26",
-"n 	c #DAC1A4",
-"o 	c #DCD9DF",
-"p 	c #EEF3F6",
-"q 	c #B0B6C4",
-"r 	c #AEB0C4",
-"s 	c #BDBECF",
-"t 	c #B2B3C6",
-"u 	c #A6A7BB",
-"v 	c #9A9BB1",
-"w 	c #8C8EA5",
-"x 	c #797D94",
-"y 	c #98A0B4",
-"z 	c #B3BCD0",
-"A 	c #A99EAF",
-"B 	c #C46347",
-"C 	c #2B0C00",
-"D 	c #B63C1A",
-"E 	c #FED76A",
-"F 	c #E2BE8D",
-"G 	c #DCB4A6",
-"H 	c #D6BCBA",
-"I 	c #B3ABB9",
-"J 	c #A9A7B9",
-"K 	c #A4A5B7",
-"L 	c #9EA1B1",
-"M 	c #9798A9",
-"N 	c #9392A1",
-"O 	c #A2969F",
-"P 	c #C29994",
-"Q 	c #CD866F",
-"R 	c #DC6A3D",
-"S 	c #B42A0E",
-"T 	c #160101",
-"U 	c #B53817",
-"V 	c #FFDA34",
-"W 	c #FFF727",
-"X 	c #FCE43C",
-"Y 	c #F5B84C",
-"Z 	c #EDA45F",
-"` 	c #E79B6C",
-" .	c #E39872",
-"..	c #E2926F",
-"+.	c #E08764",
-"@.	c #E07853",
-"#.	c #DF623C",
-"$.	c #DA4925",
-"%.	c #C83415",
-"&.	c #B10E04",
-"*.	c #900000",
-"=.	c #180000",
-"-.	c #B53918",
-";.	c #FFD83B",
-">.	c #FFF30F",
-",.	c #FBED00",
-"'.	c #F2BD00",
-").	c #EB8F02",
-"!.	c #E4650D",
-"~.	c #DE3B14",
-"{.	c #D71E15",
-"].	c #CF180F",
-"^.	c #C60D07",
-"/.	c #BA0100",
-"(.	c #B10000",
-"_.	c #AA0000",
-":.	c #AB0000",
-"<.	c #980000",
-"[.	c #170000",
-"}.	c #FFF312",
-"|.	c #FBEC00",
-"1.	c #F2BA00",
-"2.	c #EA8B00",
-"3.	c #E45A00",
-"4.	c #DE2200",
-"5.	c #D40000",
-"6.	c #CC0000",
-"7.	c #C00000",
-"8.	c #A20103",
-"9.	c #8D0811",
-"0.	c #7F1825",
-"a.	c #6D293B",
-"b.	c #474158",
-"c.	c #60637E",
-"d.	c #7D7D99",
-"e.	c #9292AB",
-"f.	c #77779C",
-"g.	c #FDEE00",
-"h.	c #F9BF00",
-"i.	c #E68600",
-"j.	c #CC5100",
-"k.	c #AB260B",
-"l.	c #95161A",
-"m.	c #83232C",
-"n.	c #803D48",
-"o.	c #875E6B",
-"p.	c #8D7C8A",
-"q.	c #9698A7",
-"r.	c #A5ABB8",
-"s.	c #B7BCC6",
-"t.	c #CBC7CD",
-"u.	c #D0CBCF",
-"v.	c #C7C4CC",
-"w.	c #CAC9CF",
-"x.	c #9F9FB8",
-"y.	c #262641",
-"z.	c #B63915",
-"A.	c #FFD838",
-"B.	c #FFF413",
-"C.	c #F9EA00",
-"D.	c #99822F",
-"E.	c #8D7B67",
-"F.	c #958B89",
-"G.	c #A2A5A9",
-"H.	c #B4BABD",
-"I.	c #C6CDCE",
-"J.	c #D2DADA",
-"K.	c #D5DCE2",
-"L.	c #CDD5DF",
-"M.	c #BCC5D7",
-"N.	c #A0B5D8",
-"O.	c #83A5D9",
-"P.	c #6B98DB",
-"Q.	c #5A8FDE",
-"R.	c #3C80E3",
-"S.	c #5E8AD2",
-"T.	c #B4B0BE",
-"U.	c #3F3F61",
-"V.	c #AA372A",
-"W.	c #F9D742",
-"X.	c #FFFC02",
-"Y.	c #B1AB13",
-"Z.	c #6F7184",
-"`.	c #EDF1F8",
-" +	c #EAECEF",
-".+	c #CBD4E0",
-"++	c #B2C6E0",
-"@+	c #97B7E0",
-"#+	c #84ADE2",
-"$+	c #79A8E5",
-"%+	c #6DA2E9",
-"&+	c #5E9CED",
-"*+	c #5299F8",
-"=+	c #509AFD",
-"-+	c #529BFE",
-";+	c #509CFF",
-">+	c #4094FF",
-",+	c #3D7EE0",
-"'+	c #B4B3C0",
-")+	c #5D5C7F",
-"!+	c #9D363D",
-"~+	c #D1D0B4",
-"{+	c #FFF856",
-"]+	c #A29E28",
-"^+	c #72727F",
-"/+	c #E5E2E1",
-"(+	c #94B7DB",
-"_+	c #97C2EF",
-":+	c #A3CBF7",
-"<+	c #A6CEFC",
-"[+	c #AAD0FF",
-"}+	c #ABD1FF",
-"|+	c #A1CAFF",
-"1+	c #94C4FF",
-"2+	c #8ABDFF",
-"3+	c #7EB6FF",
-"4+	c #6DACFF",
-"5+	c #559EFF",
-"6+	c #4195FF",
-"7+	c #2877EB",
-"8+	c #9DA6C2",
-"9+	c #767292",
-"0+	c #0E0E1C",
-"a+	c #9F3636",
-"b+	c #C7CED6",
-"c+	c #EBEDF5",
-"d+	c #BEBCAD",
-"e+	c #606061",
-"f+	c #D3CECE",
-"g+	c #9ABEE5",
-"h+	c #D5EBFF",
-"i+	c #EEF4FF",
-"j+	c #D2E5FF",
-"k+	c #BFDAFF",
-"l+	c #ACD0FF",
-"m+	c #9BC7FF",
-"n+	c #8FBFFF",
-"o+	c #7FB6FF",
-"p+	c #4F9BFF",
-"q+	c #2B84FD",
-"r+	c #1875F6",
-"s+	c #0E6AF1",
-"t+	c #075DE3",
-"u+	c #8498C5",
-"v+	c #8E89A3",
-"w+	c #161629",
-"x+	c #C8CFCE",
-"y+	c #E8EAEB",
-"z+	c #D1D1D7",
-"A+	c #5C5C5D",
-"B+	c #BBB7B7",
-"C+	c #A6C0DF",
-"D+	c #AAD1FD",
-"E+	c #DEECFF",
-"F+	c #C4DDFF",
-"G+	c #B4D4FF",
-"H+	c #A4CAFF",
-"I+	c #9AC5FF",
-"J+	c #76B1FF",
-"K+	c #2C89FF",
-"L+	c #016BFE",
-"M+	c #0064F8",
-"N+	c #005FEE",
-"O+	c #005AE5",
-"P+	c #0050DD",
-"Q+	c #6588C7",
-"R+	c #A09AB0",
-"S+	c #2A2A44",
-"T+	c #C9CFCF",
-"U+	c #E5E7E7",
-"V+	c #E0E0E0",
-"W+	c #676767",
-"X+	c #A3A1A1",
-"Y+	c #B8C4D9",
-"Z+	c #93BFF0",
-"`+	c #D6E9FF",
-" @	c #BDD9FF",
-".@	c #ACCFFF",
-"+@	c #A3CAFF",
-"@@	c #7BB5FF",
-"#@	c #2386FF",
-"$@	c #0472FF",
-"%@	c #006AFC",
-"&@	c #0065F4",
-"*@	c #005FEA",
-"=@	c #005AE3",
-"-@	c #004FDB",
-";@	c #4B78C9",
-">@	c #A5A0B1",
-",@	c #454569",
-"'@	c #E4E6E6",
-")@	c #E7E7E7",
-"!@	c #7D7D7E",
-"~@	c #898788",
-"{@	c #C7CAD5",
-"]@	c #89B6EA",
-"^@	c #C7E1FF",
-"/@	c #B6D5FF",
-"(@	c #ABCEFF",
-"_@	c #86BBFF",
-":@	c #2F8EFF",
-"<@	c #117BFF",
-"[@	c #0570FF",
-"}@	c #0068F8",
-"|@	c #0063F0",
-"1@	c #005DE7",
-"2@	c #0059DF",
-"3@	c #004CD6",
-"4@	c #3369CD",
-"5@	c #A3A2B4",
-"6@	c #585880",
-"7@	c #909090",
-"8@	c #717072",
-"9@	c #C6C4CB",
-"0@	c #84AFE7",
-"a@	c #B5D7FF",
-"b@	c #B5D4FF",
-"c@	c #96C4FF",
-"d@	c #3A96FF",
-"e@	c #1C82FF",
-"f@	c #0D77FF",
-"g@	c #006BFD",
-"h@	c #0066F4",
-"i@	c #0061EC",
-"j@	c #005BE4",
-"k@	c #0055DB",
-"l@	c #004ED3",
-"m@	c #0D51CB",
-"n@	c #9298B7",
-"o@	c #6B6A90",
-"p@	c #0B0B17",
-"q@	c #E5E6E6",
-"r@	c #E6E6E6",
-"s@	c #9F9F9F",
-"t@	c #636265",
-"u@	c #BFBABC",
-"v@	c #80AAE1",
-"w@	c #9FC9FF",
-"x@	c #A8CEFF",
-"y@	c #4EA1FF",
-"z@	c #2489FF",
-"A@	c #187EFF",
-"B@	c #0069FA",
-"C@	c #005EE8",
-"D@	c #0058DF",
-"E@	c #0052D7",
-"F@	c #004DCE",
-"G@	c #0047C8",
-"H@	c #7B8CBA",
-"I@	c #7E7B9B",
-"J@	c #1D1D34",
-"K@	c #E5E5E5",
-"L@	c #AAAAAB",
-"M@	c #5E5E60",
-"N@	c #B3ADAC",
-"O@	c #90ADDA",
-"P@	c #78B4FC",
-"Q@	c #61ADFF",
-"R@	c #2D90FF",
-"S@	c #2185FF",
-"T@	c #0E78FF",
-"U@	c #016CFE",
-"V@	c #0066F5",
-"W@	c #005CE4",
-"X@	c #0055DC",
-"Y@	c #0050D3",
-"Z@	c #004ACB",
-"`@	c #003AC2",
-" #	c #617CC1",
-".#	c #8C89A2",
-"+#	c #2D2D4C",
-"@#	c #E4E4E4",
-"##	c #B5B5B5",
-"$#	c #606062",
-"%#	c #9D9A9B",
-"&#	c #ABB6CF",
-"*#	c #3D94F7",
-"=#	c #3C9CFF",
-"-#	c #2C8DFF",
-";#	c #1A80FF",
-">#	c #0772FF",
-",#	c #0068FB",
-"'#	c #0062F2",
-")#	c #005BEA",
-"!#	c #0053E2",
-"~#	c #004FD9",
-"{#	c #024BCF",
-"]#	c #094DC7",
-"^#	c #1950C0",
-"/#	c #6681C0",
-"(#	c #8987A0",
-"_#	c #41416E",
-":#	c #E3E3E3",
-"<#	c #BCBCBC",
-"[#	c #69696B",
-"}#	c #858488",
-"|#	c #BDBAC5",
-"1#	c #3E8DEF",
-"2#	c #3094FF",
-"3#	c #1C84FF",
-"4#	c #0473FF",
-"5#	c #0069FD",
-"6#	c #0364F2",
-"7#	c #1464E5",
-"8#	c #296AD7",
-"9#	c #4A7ACB",
-"0#	c #6281BF",
-"a#	c #7B8CB9",
-"b#	c #9098B4",
-"c#	c #ABAAB7",
-"d#	c #B4B2B9",
-"e#	c #B8B7BD",
-"f#	c #AAAAB9",
-"g#	c #8080A3",
-"h#	c #5B5B8F",
-"i#	c #A03838",
-"j#	c #E2E2E2",
-"k#	c #727274",
-"l#	c #727276",
-"m#	c #BDB6BB",
-"n#	c #508DE5",
-"o#	c #1579F9",
-"p#	c #347FE8",
-"q#	c #5287D9",
-"r#	c #6B8DCB",
-"s#	c #8699C1",
-"t#	c #9BA4BC",
-"u#	c #BAB8C0",
-"v#	c #CCC6C4",
-"w#	c #D1CCC9",
-"x#	c #D3D0CE",
-"y#	c #D3D0D6",
-"z#	c #D1D2E3",
-"A#	c #D4D6EE",
-"B#	c #DADBF6",
-"C#	c #DCDEE9",
-"D#	c #D4D4D4",
-"E#	c #BFBFC4",
-"F#	c #A6A6B9",
-"G#	c #8686AD",
-"H#	c #56568C",
-"I#	c #3E3E79",
-"J#	c #A13434",
-"K#	c #CAD4D4",
-"L#	c #7C7C7D",
-"M#	c #67676A",
-"N#	c #ACABB4",
-"O#	c #AAB1CA",
-"P#	c #AAB1C9",
-"Q#	c #C5C2C7",
-"R#	c #D3CCCA",
-"S#	c #D7D1D0",
-"T#	c #DAD7D8",
-"U#	c #DEDCE0",
-"V#	c #D8D9EA",
-"W#	c #CCCFF1",
-"X#	c #C5C8F6",
-"Y#	c #C5C9FA",
-"Z#	c #CACDFF",
-"`#	c #D0D3FF",
-" $	c #D7DAFF",
-".$	c #E1E3FF",
-"+$	c #EAECFF",
-"@$	c #EDEEFD",
-"#$	c #E2E3E7",
-"$$	c #CBCBC7",
-"%$	c #C8C8C4",
-"&$	c #BDBDC0",
-"*$	c #9E9EAF",
-"=$	c #6A6A9D",
-"-$	c #840808",
-";$	c #C18B8B",
-">$	c #EBF3F3",
-",$	c #E8F0F0",
-"'$	c #BDC2C2",
-")$	c #878A8A",
-"!$	c #616367",
-"~$	c #B1B1B4",
-"{$	c #D0CECC",
-"]$	c #DEDBD8",
-"^$	c #E4E4E2",
-"/$	c #E6E6E5",
-"($	c #E7E8EA",
-"_$	c #D2D4F9",
-":$	c #B9BEFD",
-"<$	c #B0B5FF",
-"[$	c #B4B9FF",
-"}$	c #BFC3FF",
-"|$	c #C9CEFF",
-"1$	c #D5D8FF",
-"2$	c #DDDFFF",
-"3$	c #E4E7FC",
-"4$	c #E3E4EF",
-"5$	c #DADBDF",
-"6$	c #D1D1D2",
-"7$	c #C5C5C5",
-"8$	c #B1B1B1",
-"9$	c #959595",
-"0$	c #717170",
-"a$	c #606056",
-"b$	c #676782",
-"c$	c #17172F",
-"d$	c #5C0303",
-"e$	c #9E4545",
-"f$	c #C08787",
-"g$	c #B59F9F",
-"h$	c #8F8787",
-"i$	c #5D5C5F",
-"j$	c #777A7E",
-"k$	c #9DA0A4",
-"l$	c #B1B2B2",
-"m$	c #BCBBBB",
-"n$	c #C5C5C3",
-"o$	c #D3D3D3",
-"p$	c #E1E1E1",
-"q$	c #DDDDEA",
-"r$	c #D4D6F5",
-"s$	c #CED1FD",
-"t$	c #D4D6FD",
-"u$	c #DDDEF5",
-"v$	c #DBDCE7",
-"w$	c #D8D8DB",
-"x$	c #D0CFCF",
-"y$	c #C0C1BF",
-"z$	c #ACACAB",
-"A$	c #959594",
-"B$	c #82827F",
-"C$	c #737370",
-"D$	c #64646D",
-"E$	c #595973",
-"F$	c #565680",
-"G$	c #48487B",
-"H$	c #0D0D1B",
-"I$	c #2C0000",
-"J$	c #4B0E0E",
-"K$	c #541717",
-"L$	c #521516",
-"M$	c #430E10",
-"N$	c #442329",
-"O$	c #59535C",
-"P$	c #777882",
-"Q$	c #97979B",
-"R$	c #A7A7A8",
-"S$	c #AFAFAE",
-"T$	c #BABAB6",
-"U$	c #CBCAC6",
-"V$	c #D7D8D8",
-"W$	c #D9D9DB",
-"X$	c #D2D1CF",
-"Y$	c #C4C3C1",
-"Z$	c #B0AFAD",
-"`$	c #9B9B99",
-" %	c #8B8B88",
-".%	c #7E7E7D",
-"+%	c #74747B",
-"@%	c #66667E",
-"#%	c #5A5A82",
-"$%	c #44446F",
-"%%	c #29294B",
-"&%	c #131329",
-"*%	c #06060E",
-"=%	c #131319",
-"-%	c #2C2C37",
-";%	c #545463",
-">%	c #757584",
-",%	c #8D8D94",
-"'%	c #989897",
-")%	c #A1A19E",
-"!%	c #A9A9A7",
-"~%	c #A2A29F",
-"{%	c #91918E",
-"]%	c #848484",
-"^%	c #7A7A85",
-"/%	c #696983",
-"(%	c #535376",
-"_%	c #363659",
-":%	c #1F1F3C",
-"<%	c #0D0D1A",
-"[%	c #12121C",
-"}%	c #333345",
-"|%	c #5A5A6F",
-"1%	c #737385",
-"2%	c #88888E",
-"3%	c #7E7E89",
-"4%	c #686882",
-"5%	c #50506E",
-"6%	c #30304C",
-"7%	c #16162A",
-"8%	c #080811",
-"9%	c #1A1A29",
-"0%	c #2E2E44",
-"a%	c #26263C",
-"b%	c #11111F",
-"                                                                ",
-"            . + @ # $                                           ",
-"    % & * = - ; > , ' ) ! ~ {                                   ",
-"  ] ^ / ( _ : < [ } | 1 2 3 4 5                                 ",
-"6 7 8 9 0 a b c d e f g h i j k l                               ",
-"m n o p q r s t u v w x y z A B C                               ",
-"D E F G H I J K L M N O P Q R S T                               ",
-"U V W X Y Z `  ...+.@.#.$.%.&.*.=.                              ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.                              ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f.                      ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.                    ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.                    ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+                    ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+                  ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+                  ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+                  ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@                  ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@                  ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@                ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@                ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+#                ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#                ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#            ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#    ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$  ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-"  d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-"      I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%  ",
-"                    =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%          ",
-"                          [%}%|%1%2%3%4%5%6%7%8%                ",
-"                                9%0%a%b%                        ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/menu b/ubuntu/_base/applications/system/kpowersave/debian/menu
deleted file mode 100644
index c875d9194..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(kpowersave-trinity):\
-  needs="X11"\
-  section="Applications/System/Monitoring"\
-  title="KPowersave"\
-  longtitle="Battery monitor and general power management"\
-  icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/postinst b/ubuntu/_base/applications/system/kpowersave/debian/postinst
deleted file mode 100644
index cf7c41189..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kpowersave-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/postrm b/ubuntu/_base/applications/system/kpowersave/debian/postrm
deleted file mode 100644
index 99bd13d89..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/postrm
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  remove)
-    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
-    ;;
-  purge)
-    ;;
-  upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/preinst b/ubuntu/_base/applications/system/kpowersave/debian/preinst
deleted file mode 100644
index 3fe8514bd..000000000
--- a/ubuntu/_base/applications/system/kpowersave/debian/preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  install)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  upgrade)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    if [ -z "$divert" ]; then
-      dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    fi
-    ;;
-  abort-upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/system/krusader/debian/README.Debian b/ubuntu/_base/applications/system/krusader/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
-	<debian-kde@lists.debian.org>	mailing list
-	#debian-kde			on irc
-
-Packaging queries
-	<debian-qt-kde@lists.debian.org>  mailing list
-	#debian-qt-kde			  on irc
-
-Maintainers
-	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
-
-
-2. Subversion repository
-------------------------
-  
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
-	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must 
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
-release is made.
-
-When, at some point, the need to have two different versions at the same time 
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and 
-if a new unstable package needs to be cooked, copying 
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-	
-	% svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-	
-	% svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
-	% svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
-	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're 
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is 
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
-        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive.  Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory.  The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/krusader/debian/compat b/ubuntu/_base/applications/system/krusader/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/krusader/debian/compat
+++ b/ubuntu/_base/applications/system/krusader/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control
index 98b03a2c2..03efd3f09 100644
--- a/ubuntu/_base/applications/system/krusader/debian/control
+++ b/ubuntu/_base/applications/system/krusader/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libkonq4-trinity-dev, libacl1-dev
 Standards-Version: 3.8.4
 Homepage: http://krusader.sourceforge.net
 
@@ -34,15 +34,3 @@ Description: twin-panel (commander-style) file manager for TDE (and other deskto
  .
  Almost completely customizable, Krusader is very user friendly, fast and looks
  great on your desktop.
-
-Package: krusader-trinity-dbg
-Section: devel
-Architecture: any
-Replaces: krusader-kde3-dbg (<< 4:14.0.0~), krusader-trinity-dbg (<< 4:14.0.0~)
-Breaks: krusader-kde3-dbg (<< 4:14.0.0~), krusader-trinity-dbg (<< 4:14.0.0~)
-Priority: extra
-Depends: krusader-trinity (= ${binary:Version})
-Description: debugging symbols for krusader-trinity
- This package contains the debugging symbols associated with krusader-trinity.
- They will automatically be used by gdb for debugging krusader-related
- issues.
diff --git a/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
deleted file mode 100644
index 62bf48233..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# package depends on tdebase-bin, which provides tdesu
-krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu
diff --git a/ubuntu/_base/applications/system/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules
index cdbcf9176..f105545bb 100755
--- a/ubuntu/_base/applications/system/krusader/debian/rules
+++ b/ubuntu/_base/applications/system/krusader/debian/rules
@@ -1,36 +1,15 @@
 #!/usr/bin/make -f
 
-# Currently is not possible to build piklab with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
 include /usr/share/cdbs/1/rules/debhelper.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
-
-DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-install/krusader-trinity::
-	# install xpm files used by menu
-	install -D -p -m0644 pics/cr16-app-krusader_root.xpm \
-		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root-16.xpm
-	install -D -p -m0644 pics/cr16-app-krusader_user.xpm \
-		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user-16.xpm
-	install -D -p -m0644 pics/cr32-app-krusader_root.xpm \
-		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_root.xpm
-	install -D -p -m0644 pics/cr32-app-krusader_user.xpm \
-		$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm
-	# install properly tdeio_isorc
-	install -D -p -m0644 iso/tdeio_isorc \
-		$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc
-	# install lintian override
-	install -D -p -m0644 debian/krusader.lintian-overrides \
-		$(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg)
-
-binary-post-install/krusader-trinity::
-	rm -rf debian/krusader-trinity/etc/trinity/
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
deleted file mode 100644
index 01d57f16c..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# will be cleaned in next upstream release
-krusader source: source-contains-CVS-dir admin/CVS
diff --git a/ubuntu/_base/applications/system/krusader/debian/watch b/ubuntu/_base/applications/system/krusader/debian/watch
deleted file mode 100644
index d19bef39d..000000000
--- a/ubuntu/_base/applications/system/krusader/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/~/-/ \
-     http://sf.net/krusader/krusader-([\d\.].*)\.tar\.gz debian svn-upgrade
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/compat b/ubuntu/_base/applications/system/kshutdown/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/compat
+++ b/ubuntu/_base/applications/system/kshutdown/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/control b/ubuntu/_base/applications/system/kshutdown/debian/control
index 96b27b2e7..0ca59673e 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/control
+++ b/ubuntu/_base/applications/system/kshutdown/debian/control
@@ -2,7 +2,7 @@ Source: kshutdown-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.1
 
 Package: kshutdown-trinity
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/docs b/ubuntu/_base/applications/system/kshutdown/debian/docs
index 9341bcf45..d70cd6976 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/docs
+++ b/ubuntu/_base/applications/system/kshutdown/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
-README
+README.md
 TODO
 VERSION
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/rules b/ubuntu/_base/applications/system/kshutdown/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/kshutdown/debian/rules
+++ b/ubuntu/_base/applications/system/kshutdown/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/compat
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control
index 87c685c42..741925e62 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/control
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: ksystemlog-trinity
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/docs
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/rules b/ubuntu/_base/applications/system/ksystemlog/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/ksystemlog/debian/rules
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/compat
+++ b/ubuntu/_base/applications/system/kvkbd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control
index 9c315cf0b..f67225997 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/control
+++ b/ubuntu/_base/applications/system/kvkbd/debian/control
@@ -2,7 +2,7 @@ Source: kvkbd-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libxtst-dev, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libxtst-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://pan4os.info/main/index.php
 
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/docs b/ubuntu/_base/applications/system/kvkbd/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/docs
+++ b/ubuntu/_base/applications/system/kvkbd/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/rules b/ubuntu/_base/applications/system/kvkbd/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/kvkbd/debian/rules
+++ b/ubuntu/_base/applications/system/kvkbd/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog
new file mode 100644
index 000000000..434ce69fc
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog
@@ -0,0 +1,67 @@
+polkit-agent-tde (0.99.1-2) unstable; urgency=low
+
+  * Port to TDE and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 19 Dec 2021 18:12:00 +0900
+
+polkit-kde-1 (0.99.1-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Felix Geyer ]
+  * New upstream release.
+    - Drop fix_dialog_focus.diff, applied upstream.
+    - Remove non-functional checkbox "Remember password". (Closes: #691104)
+  * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop
+    on upgrade. (Closes: #645440)
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
+  [ Pino Toscano ]
+  * The rebuild changes the tdebase-runtime dependency to kde-runtime.
+    (Closes: #716849)
+  * Update Vcs-* headers
+
+ -- Felix Geyer <fgeyer@debian.org>  Mon, 12 Aug 2013 11:58:57 +0200
+
+polkit-kde-1 (0.99.0-3) unstable; urgency=low
+
+  [ Scott Kitterman ]
+  * Add debian/patches/fix_dialog_focus.diff from Kubuntu
+    - Prevents the auth dialog from popping up in the background where it can't
+      be seen
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 23 Jun 2011 11:38:30 +0300
+
+polkit-kde-1 (0.99.0-2) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:28:45 +0300
+
+polkit-kde-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch to dhmk based debian-qt-kde.mk.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump Standards-Version to 3.9.1, no changes needed.
+  * Bump libpolkit-qt-1-dev build depend to 0.99.0.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 23 Mar 2011 01:30:52 +0200
+
+polkit-kde-1 (0.95.1-2) unstable; urgency=low
+
+  * Update debian/control: add policykit-1 dependency.
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 22 Mar 2010 09:08:17 +0100
+
+polkit-kde-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #571531)
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 25 Feb 2010 20:43:18 +0100
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
new file mode 100644
index 000000000..e0f772f46
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
@@ -0,0 +1,25 @@
+Source: polkit-agent-tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
+Standards-Version: 3.9.4
+Section: libs
+
+Package: polkit-agent-tde
+Architecture: any
+Provides: polkit-1-auth-agent
+Replaces: tde-ubuntu-integration
+Breaks: tde-ubuntu-integration
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1 | polkitd
+Conflicts: tde-ubuntu-integration
+Description: TDE dialogs for PolicyKit
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+ bring up authentication dialogs used for obtaining privileges.
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright
new file mode 100644
index 000000000..a9cebd94f
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright
@@ -0,0 +1,52 @@
+This code was ported to TDE and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-kde-1/0.99.1-1/
+
+Original polkit-kde-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Jaroslav Reznik <jreznik@redhat.com>
+    Gökçen Eraslan <gokcen@pardus.org.tr>
+    Dario Freddi <drf@kde.org>
+    Daniel Nicoletti <dantti85-pk@yahoo.com.br>
+    Dirk Mueller <mueller@kde.org>
+
+Copyright:
+
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2007-2008 Gökçen Eraslan
+    Copyright (C) 2008-2009 Dario Freddi
+    Copyright (C) 2008 Daniel Nicoletti
+    Copyright (C) 2008 Dirk Mueller
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/dependencies/dbus-tqt/debian/source/format b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/source/format
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/source/options b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/source/options
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/compat b/ubuntu/_base/applications/system/smartcardauth/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/compat
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
index a034b10be..d1d2e04eb 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/control
@@ -2,7 +2,7 @@ Source: smartcardauth
 Section: tde
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
 Standards-Version: 3.8.4
 
 Package: smartcardauth
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/docs b/ubuntu/_base/applications/system/smartcardauth/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules
index 14ccf6018..97c83eb02 100755
--- a/ubuntu/_base/applications/system/smartcardauth/debian/rules
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/rules
@@ -1,26 +1,13 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_BUILD_OPTIONS := nostrip
 export DEB_BUILD_OPTIONS = debug nostrip
 
 CFLAGS=-g -Wall -fPIC
 
-DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)"
-DEB_INSTALL_DOCS_ALL :=
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
 DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info
 
 DEB_CMAKE_EXTRA_FLAGS := \
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/compat b/ubuntu/_base/applications/system/tastymenu/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/compat
+++ b/ubuntu/_base/applications/system/tastymenu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/control b/ubuntu/_base/applications/system/tastymenu/debian/control
index e45a57ac9..e612d54ec 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/control
+++ b/ubuntu/_base/applications/system/tastymenu/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Marco Martin <notmart@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxau-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxau-dev
 Standards-Version: 3.8.0
 
 Package: tastymenu-trinity
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/docs b/ubuntu/_base/applications/system/tastymenu/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/tastymenu/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/patches/series b/ubuntu/_base/applications/system/tastymenu/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/patches/series
+++ b/ubuntu/_base/applications/system/tastymenu/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/rules b/ubuntu/_base/applications/system/tastymenu/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/system/tastymenu/debian/rules
+++ b/ubuntu/_base/applications/system/tastymenu/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/changelog b/ubuntu/_base/applications/system/tdebluez/debian/changelog
new file mode 100644
index 000000000..d779b284e
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/changelog
@@ -0,0 +1,12 @@
+tdebluez-trinity (4:14.1.0-0debian10.1.1+eko1) unstable; urgency=low
+
+  * Build for buster. 
+
+ -- Emanoil Kotsev <deloptes@gmail.com>  Sat, 02 Nov 2019 22:00:00 +0100
+
+tdebluez (4:14.1.0-0debian9.0.5+eko1) unstable; urgency=low
+
+  * Rework of Dbus interface to Bluez5 for TDE 14.1. 
+
+ -- Emanoil Kotsev <deloptes@gmail.com>  Sat, 29 Sep 2018 22:00:00 +0100
+
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/compat b/ubuntu/_base/applications/system/tdebluez/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/control b/ubuntu/_base/applications/system/tdebluez/debian/control
new file mode 100644
index 000000000..328ae20cf
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/control
@@ -0,0 +1,76 @@
+Source: tdebluez-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-1-tqt-dev
+Build-Depends-Indep: doxygen, graphviz
+Standards-Version: 3.8.0
+
+Package: tdebluez-trinity
+Section: tde
+Architecture: any
+Depends: ${shlibs:Depends}, bluez (>= 5~), bluez-obexd (>= 5~)
+Suggests: pulseaudio-module-bluetooth
+Description: TDE Bluetooth Framework
+ The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
+ stack BlueZ5. It provides easy access to the most common Bluetooth profiles and
+ makes data exchange with Bluetooth devices like phones and PDAs as
+ straightforward as possible.
+ .
+ Features:
+  * tdebluez -- a tray applet to handle incoming inquiries and control
+                adapters and devices
+  * tdebluezauth -- authentication agent
+  * tdeioclient -- cli to obex
+
+Package: libtdebluez-trinity
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, bluez (>= 5~)
+Description: Bluetooth library for TDE
+ This package is part of the TDE Bluetooth Framework.
+ It contains a Bluetooth library for TDE.
+ .
+ See the 'tdebluez-trinity' package for more informations.
+
+Package: libtdeobex-trinity
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, bluez-obexd (>= 5~)
+Description: Obex library for TDE
+ This package is part of the TDE Bluetooth Framework.
+ It contains a Bluetooth library for TDE.
+ .
+ See the 'tdebluez-trinity' package for more informations.
+
+Package: libtdebluez-trinity-dev
+Architecture: any
+Section: libdevel
+Depends: libtdebluez-trinity (= ${binary:Version})
+Description: development files for libtdebluez
+ This package is part of the TDE Bluetooth Framework.
+ It contains the development files for libtdebluez.
+ .
+ See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations.
+
+Package: libtdeobex-trinity-dev
+Architecture: any
+Section: libdevel
+Depends: libtdeobex-trinity (= ${binary:Version})
+Description: development files for libtdeobex
+ This package is part of the TDE Bluetooth Framework.
+ It contains the development files for libtdeobex.
+ .
+ See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations.
+
+Package: tdebluez-trinity-api-doc
+Section: doc
+Architecture: all
+Description: developer documentation for the libtdebluez-trinity and libtdeobex-trinity libraries
+ This package contains documentation for the libtdebluez-trinity and libtdeobex-trinity libraries of
+ use more for developers creating applications which use the libtdebluez-trinity and libtdeobex-trinity 
+ libraries, than regular users.
+ .
+ This package is part of the provided bindings for the Trinity TQt interface.
+ .
+ See the tdebluez-trinity description for more information about tdebluez in general.
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/copyright b/ubuntu/_base/applications/system/tdebluez/debian/copyright
new file mode 100644
index 000000000..7fc5c091b
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/copyright
@@ -0,0 +1,43 @@
+This package was debianized by Emanoil Kotsev <deloptes@gmail.com>
+on Fri, 19 Sep 2003 18:47:31 +0200.
+
+It was downloaded from http://bluetooth.kmobiletools.org
+
+Ported to TDE by Emanoil Kotsev <deloptes@gmail.com>
+on Tue, 22 Nov 2016 17:23:21 +0100.
+
+Upstream Authors:
+
+    Emanoil Kotsev <deloptes@gmail.com>
+
+Copyright:
+
+    (C) 2018 Emanoil Kotsev <deloptes@gmail.com>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The documentations provided with kdebluetooth is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
+
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/docs b/ubuntu/_base/applications/system/tdebluez/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install
new file mode 100644
index 000000000..6425a944e
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install
@@ -0,0 +1,3 @@
+opt/trinity/include/tdebluez/*
+opt/trinity/lib/libtdebluez.so
+opt/trinity/share/cmake/libtdebluez.cmake
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install
new file mode 100644
index 000000000..72a1ac2a2
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install
@@ -0,0 +1,2 @@
+opt/trinity/lib/libtdebluez.la
+opt/trinity/lib/libtdebluez.so.*
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install
new file mode 100644
index 000000000..e60909e04
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install
@@ -0,0 +1,3 @@
+opt/trinity/include/tdeobex/*
+opt/trinity/lib/libtdeobex.so
+opt/trinity/share/cmake/libtdeobex.cmake
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install
new file mode 100644
index 000000000..2557b6e5f
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install
@@ -0,0 +1,2 @@
+opt/trinity/lib/libtdeobex.la
+opt/trinity/lib/libtdeobex.so.*
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/rules b/ubuntu/_base/applications/system/tdebluez/debian/rules
new file mode 100755
index 000000000..affdcdb09
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_KDE_APIDOX := yes
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/dependencies/python-tqt/debian/source/format b/ubuntu/_base/applications/system/tdebluez/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/source/format
+++ b/ubuntu/_base/applications/system/tdebluez/debian/source/format
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/source/options b/ubuntu/_base/applications/system/tdebluez/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/source/options
+++ b/ubuntu/_base/applications/system/tdebluez/debian/source/options
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install
new file mode 100644
index 000000000..50a3931d0
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/tdebluez-trinity-api/HTML/en/*
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install
new file mode 100644
index 000000000..80063c949
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install
@@ -0,0 +1,27 @@
+opt/trinity/bin/tdebluez
+opt/trinity/bin/tdebluezauth
+opt/trinity/bin/tdebluezioclient
+opt/trinity/lib/trinity/tdebluez.so
+opt/trinity/lib/trinity/tdebluez.la
+opt/trinity/lib/libtdeinit_tdebluez.so
+opt/trinity/lib/libtdeinit_tdebluez.la
+opt/trinity/lib/trinity/tdeio_bluetooth.so
+opt/trinity/lib/trinity/tdeio_bluetooth.la
+opt/trinity/lib/trinity/tdeio_obex.so
+opt/trinity/lib/trinity/tdeio_obex.la
+opt/trinity/share/apps/tdebluez/icons/*
+opt/trinity/share/doc/tde/HTML/*
+opt/trinity/share/apps/tdebluez/eventsrc
+opt/trinity/share/apps/tdebluez/tde-settings-network-bluetooth.directory
+opt/trinity/share/applications/tde/tdebluez.desktop
+opt/trinity/share/applications/tde/tdebluezauth.desktop
+opt/trinity/share/autostart/tdebluez.autostart.desktop
+opt/trinity/share/icons
+opt/trinity/share/locale
+opt/trinity/share/mimelnk/bluetooth/*
+opt/trinity/share/services/bluetooth.protocol
+opt/trinity/share/services/obexftp.protocol
+opt/trinity/share/services/obexopp.protocol
+opt/trinity/share/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
+opt/trinity/share/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop
+/etc/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/compat b/ubuntu/_base/applications/system/tdedocker/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdedocker/debian/compat
+++ b/ubuntu/_base/applications/system/tdedocker/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/control b/ubuntu/_base/applications/system/tdedocker/debian/control
index c2bc9a5c0..4becf9e72 100644
--- a/ubuntu/_base/applications/system/tdedocker/debian/control
+++ b/ubuntu/_base/applications/system/tdedocker/debian/control
@@ -2,7 +2,7 @@ Source: tdedocker-trinity
 Section: x11
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxpm-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxpm-dev
 Standards-Version: 3.7.2
 
 Package: tdedocker-trinity
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/rules b/ubuntu/_base/applications/system/tdedocker/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/tdedocker/debian/rules
+++ b/ubuntu/_base/applications/system/tdedocker/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/compat b/ubuntu/_base/applications/system/tdepowersave/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/compat
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/control b/ubuntu/_base/applications/system/tdepowersave/debian/control
index 4a715d99b..95d4df5e7 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/control
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/docs b/ubuntu/_base/applications/system/tdepowersave/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules
index 01e5357b6..42167de41 100755
--- a/ubuntu/_base/applications/system/tdepowersave/debian/rules
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/rules
@@ -1,10 +1,7 @@
 #!/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_INSTALL_DOCS_ALL := AUTHORS NEWS
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -20,4 +17,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
 
 install/tdepowersave-trinity::
 	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
index e27c64261..f89a3be85 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -1,5 +1,3 @@
 tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
 tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
-tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
-tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
 
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
deleted file mode 100644
index a00246bd9..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdepowersave-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
deleted file mode 100644
index 5b4e8bfd7..000000000
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,237 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/control b/ubuntu/_base/applications/system/tdesshaskpass/debian/control
index dd6674b51..d1791631c 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/control
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Armin Berres <trigger+debian@space-based.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.0
 
 Package: tdesshaskpass-trinity
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/docs b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/rules b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/rules
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/changelog b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
new file mode 100644
index 000000000..574e76971
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
@@ -0,0 +1,5 @@
+xdg-desktop-portal-trinity (0.1-0) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 06 Oct 2024 12:54:00 +0900
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/compat b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/control b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/control
new file mode 100644
index 000000000..ce17477f4
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/control
@@ -0,0 +1,15 @@
+Source: xdg-desktop-portal-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+
+Package: xdg-desktop-portal-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, xdg-desktop-portal
+Conflicts: xdg-desktop-portals-trinity
+Provides: xdg-desktop-portals-trinity
+Replaces: xdg-desktop-portals-trinity
+Description: An implementation of the FreeDesktop Portals API for TDE
+ Exposes TDE APIs to applications which use the Portals API.
+ As a result, these applications can transparently use native TDE APIs and dialogs.
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/copyright b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
new file mode 100644
index 000000000..7943bd7ff
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
@@ -0,0 +1,4 @@
+This package was debianized by Michele Calgaro  <michele.calgaro@yahoo.it> on
+Sun 06 Oct 2024 12:54:00 +0900
+
+Created by Mavridis Philippe <mavridisf@gmail.com> on Thu 01 Feb 2024 16:44:26 +0200
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/docs b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/doc-base b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/doc-base
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules
new file mode 100755
index 000000000..b2d712d83
--- /dev/null
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/dependencies/tqt3/debian/source/format b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/source/format
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
diff --git a/ubuntu/_base/dependencies/tqt3/debian/source/options b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/source/options
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/options
diff --git a/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/system/yakuake/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/yakuake/debian/compat
+++ b/ubuntu/_base/applications/system/yakuake/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control
index 0692e6ab1..05fc6095e 100644
--- a/ubuntu/_base/applications/system/yakuake/debian/control
+++ b/ubuntu/_base/applications/system/yakuake/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://extragear.kde.org/apps/yakuake/
 
diff --git a/ubuntu/_base/applications/system/yakuake/debian/rules b/ubuntu/_base/applications/system/yakuake/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/system/yakuake/debian/rules
+++ b/ubuntu/_base/applications/system/yakuake/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog
new file mode 100644
index 000000000..39785e5c7
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low
+
+  * First TDE release
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
new file mode 100644
index 000000000..07feaec84
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -0,0 +1,16 @@
+Source: tdeio-appinfo-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-appinfo-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: TDEIO slave for the appinfo protocol
+ Adds support for the "appinfo:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform appinfo: searches in TDE.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright
new file mode 100644
index 000000000..f64b4fdd9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 08 May 2022 20:11:00 +0900
+
+Copyright:
+    This program was initially written by Robert Hogan <robert@roberthogan.net>
+
+License:
+    You are free to distribute this software under the terms of
+    the GNU General Public License 2 or higher.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/links b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/links
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules
new file mode 100755
index 000000000..90b978635
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/source/format
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/source/options
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
index 67b389d0e..59c508548 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-apt-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
index d1455f685..4165a6e56 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
 Package: tdeio-ftps-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
index 2752551e6..160efd0c2 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-gopher-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
index 5a24d4563..a393b42cd 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
index fe7ee58c4..0fa6672a8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, bzip2, python-all
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
index c9e6b78b0..d8f798f1c 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -1,35 +1,16 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_KDE_APIDOX := yes
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
index a0a34a244..e12397c59 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2
 
 Package: tdeio-sword-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
index c0a1dda6c..16c1b96e6 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-umountwrapper-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
deleted file mode 100644
index 6bc424f8e..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Sans Serif 9"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Sans Serif 9"
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
deleted file mode 100644
index e25e89fd4..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Tahoma 10"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Tahoma 10"
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
index ceaa8edc8..cdbffe3cf 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1)
 Standards-Version: 3.8.4
 
 Package: gtk-qt-engine-trinity
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..76c3076c9 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
@@ -1,3 +1,3 @@
-NEWS
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
deleted file mode 100644
index b477f5ce2..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Make sure our customised gtkrc file is loaded.
-export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
index 8f250b682..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
@@ -1,34 +1,16 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-binary-install/gtk-qt-engine-trinity::
-	mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/gtk-qt-engine.rc.sh $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
index 8b7033112..98dfdc6e9 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev
 Standards-Version: 3.8.4
 
 Package: gtk3-tqt-engine-trinity
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
index 1a185d594..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
@@ -1,39 +1,16 @@
 #!/usr/bin/make -f
 
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/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)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
+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/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
index 9bc5efa75..66733d7db 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs b/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..794921e5e 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
@@ -1,8 +1,2 @@
 kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkgtk2.so
 kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkqt3.so
-
-kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so
-kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so
-
-kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so
-kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
index f1aa52d1c..670720090 100755
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
index 9d9159705..44d8cad8c 100644
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, ksplash-trinity
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, ksplash-trinity
 Standards-Version: 3.8.4
 
 Package: ksplash-engine-moodin-trinity
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
index a8384ff60..dcfc6981b 100644
--- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
+++ b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
@@ -2,7 +2,7 @@ Source: qt4-tqt-theme-engine
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: qt4-tqt-theme-engine
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
index 53546d21d..e729bf053 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, libxtst-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libxtst-dev
 Standards-Version: 3.8.0
 
 Package: tde-style-baghira-trinity
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules b/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
index 475315ddc..b021de201 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
@@ -1,6 +1,4 @@
 tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/libbaghirastarter.so
 tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/usermanager_panelapplet.so
-tde-style-baghira-trinity: postinst-must-call-ldconfig opt/trinity/lib/libbaghirastarter.so
-tde-style-baghira-trinity: postrm-should-call-ldconfig opt/trinity/lib/libbaghirastarter.so
 tde-style-baghira-trinity: several-sonames-in-same-package usermanager_panelapplet.so libbaghirastarter.so
 tde-style-baghira-trinity: package-name-doesnt-match-sonames usermanager-panelapplet libbaghirastarter
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/compat b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/control b/ubuntu/_base/applications/themes/tde-style-domino/debian/control
index 84e9929b2..73ad6b6d6 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/control
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
 Standards-Version: 3.7.3
 Homepage: http://kde-look.org/content/show.php?content=42804
 
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/docs b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/rules b/ubuntu/_base/applications/themes/tde-style-domino/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/rules
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
index 60390be44..3a7c366c1 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libgtk2.0-dev
 Standards-Version: 3.8.0
 
 Package: tde-style-ia-ora-trinity
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
index c9665f695..e867e9e26 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
index 0948b8ef4..4c9a51eb2 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
@@ -1,4 +1,4 @@
+AUTHORS
 BUGS
-README
+README.md
 TODO
-AUTHORS
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog b/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog
new file mode 100644
index 000000000..fd3fb7e76
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog
@@ -0,0 +1,125 @@
+tde-style-polyester-trinity (1.0.3-2) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Tue, 22 Mar 2024 21:04:00 +0900
+
+kde-style-polyester (1.0.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: 442928)
+  * Hardcode the uic usage to use uic-qt3
+  * Bump standards
+  * Move homepage from description to header
+  * Don't ignore errors on make clean
+  * Add some explicit linkage when needed
+  * --as-needed
+
+ -- Sune Vuorela <debian@pusling.com>  Sat, 26 Jan 2008 18:14:24 +0100
+
+kde-style-polyester (1.0.1-1) unstable; urgency=low
+
+  [ Sarah Hobbs ]
+  * New Upstream Version.
+  * Added 03_GCC4.3_FTBFS_fix.diff. (Closes: #419799)
+    Thanks to Martin Michlmayr for reporting and for the patch.
+  * Removed 01_autoconf2.6-fixes.diff - fixed upstream.
+
+  [ Sune Vuorela ]
+  * Thanks to Sarah Hobbs for adding the new upstream version.
+
+ -- Sune Vuorela <debian@pusling.com>  Fri, 18 May 2007 00:27:53 +0200
+
+kde-style-polyester (1.0-3) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Sune Vuorela <debian@pusling.com>  Fri, 13 Apr 2007 23:36:44 +0200
+
+kde-style-polyester (1.0-2) experimental; urgency=low
+
+  * The glib-and-their-way-to-not-respect-$HOME-sucks-bigtime release
+  * Use librsvg2-bin to convert the svg files to .png files instead of
+    inkscape (Closes: #413939)
+  * Run the create-buttons.sh with sh -e to make sure that build fails if the
+    svg to png conversion fails
+  * Use nice quilt (>>0.40) to manage patches
+
+ -- Sune Vuorela <debian@pusling.com>  Tue, 20 Mar 2007 09:29:17 +0100
+
+kde-style-polyester (1.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Build buttons.h on the fly instead of relying on the upstream buttons.h. 
+    the uic command generates apparantly endian-specific code. 
+    (Closes: #410373)
+  * Experimental because of etch
+
+ -- Sune Vuorela <debian@pusling.com>  Tue,  6 Mar 2007 23:42:32 +0100
+
+kde-style-polyester (1.0~beta1-1) unstable; urgency=low
+
+  * New upstream release
+  * Ack NMU ; thanks Marga and Arjan (Closes: #379812)
+
+ -- Sune Vuorela <debian@pusling.com>  Thu, 28 Sep 2006 15:38:46 +0200
+
+kde-style-polyester (0.9.2-1.1) unst able; urgency=low
+
+  * Non-maintainer upload to fix Failure To Build From Source due to the lack
+    of support of autoconf 2.6. Thanks to Arjan Oosting for the patch.
+    (Closes: #379812)
+
+ -- Margarita Manterola <marga@debian.org>  Wed,  2 Aug 2006 17:15:23 -0300
+
+kde-style-polyester (0.9.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixes copyright file
+  * Taking over after Michael Biebls initial work. Thank you.
+  * Renaming source pacage
+  * Initial upload. Closes: #338635
+
+ -- Sune Vuorela <debian@pusling.com>  Sat, 27 May 2006 18:45:00 +0000
+
+polyester (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 10 Apr 2006 03:39:16 +0200
+
+polyester (0.8.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Skipped version 0.8.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed,  8 Mar 2006 23:24:38 +0100
+
+polyester (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped debhelper compatibility to 5.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 22 Feb 2006 15:42:53 +0100
+
+polyester (0.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu>  Sat, 14 Jan 2006 22:29:58 +0100
+
+polyester (0.6.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu>  Sun,  8 Jan 2006 18:26:00 +0100
+
+polyester (0.6.5-1) unstable; urgency=low
+
+  * Initial release.
+  * Use Debian libtool and regenerate the autotools files. 
+    + Add build dependencies to automake1.9, autoconf and libtool.
+    + Patch makefile_am.diff adds missing libraries needed for linking.
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 19 Dec 2005 11:47:20 +0100
+
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/control b/ubuntu/_base/applications/themes/tde-style-polyester/debian/control
new file mode 100644
index 000000000..99c3be7fa
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/control
@@ -0,0 +1,15 @@
+Source: tde-style-polyester-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev, librsvg2-bin
+Standards-Version: 3.7.3
+
+Package: tde-style-polyester-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Polyester widget style and twin decoration for TDE
+ Widget style and twin decoration both aim to maintain a good balance between
+ eyecandy and simplicity. Widget style is based on Plastik, window decoration
+ is based on Smoothblend.
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright b/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright
new file mode 100644
index 000000000..e2d3d0919
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized for TDE by:
+    Michele Calgaro <michele.calgaro@yahoo.it> Fri, 22 Mar 2024 18:03:00 +0900.
+
+This package was originally debianized by:
+    Michael Biebl <biebl@teco.edu> on Fri, 11 Nov 2005 17:13:08 +0100.
+
+Original authors: 
+    Marco Martin <notmart@gmail.com>
+    
+    Window decoration:
+    based on Smootblend by
+    Ryan Nickell <p0z3r@users.sourceforge.net>
+    
+    Widget style:
+    based on Plastik by
+    Sandro Giessl <ceebx@users.sourceforge.net>
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/libraries/python-trinity/debian/source/format b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/format
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format
diff --git a/ubuntu/_base/libraries/python-trinity/debian/source/options b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/options
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
index 00bacf730..145a74667 100644
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
+++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules
index 02999a177..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules
+++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules
@@ -1,37 +1,16 @@
 #!/usr/bin/make -f
 
-PATH := /opt/trinity/bin:$(PATH)
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_KDE_APIDOX := yes
-
-DEB_DH_STRIP_ARGS  := --dbg-package=tde-style-qtcurve-trinity-dbg
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/compat b/ubuntu/_base/applications/themes/tdmtheme/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/compat
+++ b/ubuntu/_base/applications/themes/tdmtheme/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/control b/ubuntu/_base/applications/themes/tdmtheme/debian/control
index 163e85e3b..a6c8dc779 100644
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/control
+++ b/ubuntu/_base/applications/themes/tdmtheme/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>,
  Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://beta.smileaf.org/projects
 
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/rules b/ubuntu/_base/applications/themes/tdmtheme/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/rules
+++ b/ubuntu/_base/applications/themes/tdmtheme/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
index acac16a6d..61e4ec06e 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: twin-style-crystal-trinity
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules b/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
index 4625fc1f0..24fc06339 100644
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
 Standards-Version: 3.7.2
 
 Package: twin-style-dekorator-trinity
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog
new file mode 100644
index 000000000..7b0f84239
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog
@@ -0,0 +1,5 @@
+twin-style-fahrenheit-trinity (0.1-0) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Tue, 17 Oct 2023 20:48:00 +0900
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control
new file mode 100644
index 000000000..3b7445033
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control
@@ -0,0 +1,12 @@
+Source: twin-style-fahrenheit-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-fahrenheit-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration
+ This is a port of the KDE 3.2's version of Fahrenheit window decoration
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright
new file mode 100644
index 000000000..7ba2bdbcc
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright
@@ -0,0 +1,8 @@
+This package was debianized by Michele Calgaro	<michele.calgaro@yahoo.it> on
+Tue, 17 Oct 2023 20:48:00 +0900
+
+It was downloaded from https://www.trinity-look.org/p/1100374
+
+Original authors: 
+  Peter Clark <theclarks@mail.ru>
+  David Johnson <david@usermode.org>
diff --git a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/themes/twin-style-fahrenheit/debian/source/format b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog
new file mode 100644
index 000000000..b58d7112d
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog
@@ -0,0 +1,6 @@
+twin-style-machbunt-trinity (0.1-1) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com>  Sun, 16 Oct 2022 11:07:15 +0900
+
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
new file mode 100644
index 000000000..20f166e16
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
@@ -0,0 +1,15 @@
+Source: twin-style-machbunt-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Adrian Schroeter <adrian@suse.de>, Gerd Fleischer <gerdfleischer@web.de>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-machbunt-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration from SUSE 9.1/9.2
+ This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+ .
+ An example color scheme is provided too.
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright
new file mode 100644
index 000000000..dfd1f265b
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright
@@ -0,0 +1,31 @@
+This code was ported to TDE by:
+    Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+  Adrian Schroeter <adrian@suse.de>
+  Gerd Fleischer   <gerdfleischer@web.de>
+
+On Debian systems, the complete text of the GNU Library General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+For the rest of the package this license applies:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02111-1301, USA.
+
+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/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/themes/twin-style-machbunt/debian/source/format b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/changelog b/ubuntu/_base/applications/themes/twin-style-mallory/debian/changelog
new file mode 100644
index 000000000..ed534cb08
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/changelog
@@ -0,0 +1,6 @@
+twin-style-mallory-trinity (0.1-1) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 06 Oct 2024 19:14:00 +0900
+
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/compat b/ubuntu/_base/applications/themes/twin-style-mallory/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/control b/ubuntu/_base/applications/themes/twin-style-mallory/debian/control
new file mode 100644
index 000000000..497d0e7d0
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/control
@@ -0,0 +1,13 @@
+Source: twin-style-mallory-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Remi Villatel <maxilys@tele2.fr>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-mallory-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A twin window decoration based on the original
+ KDE Alloyon windec theme
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/copyright b/ubuntu/_base/applications/themes/twin-style-mallory/debian/copyright
new file mode 100644
index 000000000..c7ff38e87
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/copyright
@@ -0,0 +1,7 @@
+This code was ported to TDE by:
+    Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+  Remi Villatel <maxilys@tele2.fr>
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-mallory/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules b/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/themes/twin-style-mallory/debian/source/format b/ubuntu/_base/applications/themes/twin-style-mallory/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/source/options b/ubuntu/_base/applications/themes/twin-style-mallory/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
index 52c1269a5..a558c6aff 100644
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
+++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Adrian Neumaier <adrian@firehand.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.6.2
 
 Package: twin-style-suse2-trinity
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules b/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules
+++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
deleted file mode 100644
index 0737a321e..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/abakus.1
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1 b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
deleted file mode 100644
index 1411beebd..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
+++ /dev/null
@@ -1,143 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH ABAKUS 1 "Oct 2005" "Trinity Desktop Environment" "A simple keyboard-driven calculator"
-.SH NAME
-abakus
-\- A simple keyboard-driven calculator
-.SH SYNOPSIS
-abakus [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-A simple keyboard-driven calculator
-.SH OPTIONS
-.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 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:/abakus/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/abakus/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Michael Pyne <michael.pyne@kdemail.net>
-.br
-
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/abakus/debian/compat
+++ b/ubuntu/_base/applications/utilities/abakus/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control
index 5a44c5979..4327ae75e 100644
--- a/ubuntu/_base/applications/utilities/abakus/debian/control
+++ b/ubuntu/_base/applications/utilities/abakus/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules
index 3c72c1e14..411a41a23 100755
--- a/ubuntu/_base/applications/utilities/abakus/debian/rules
+++ b/ubuntu/_base/applications/utilities/abakus/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
@@ -41,8 +40,5 @@ common-install-arch::
 	install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
 	dh_icons -pabakus-trinity
 
-binary-install/abakus-trinity::
-	mv debian/abakus-trinity/usr/share/man debian/abakus-trinity/opt/trinity/share/
-
 clean::
 	rm -f debian/abakus.xpm
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/filelight/debian/compat
+++ b/ubuntu/_base/applications/utilities/filelight/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control
index ecb9a9aed..dbcfc9420 100644
--- a/ubuntu/_base/applications/utilities/filelight/debian/control
+++ b/ubuntu/_base/applications/utilities/filelight/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
 Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xutils
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, xutils
 Homepage: http://www.methylblue.com/filelight/
 
 Package: filelight-trinity
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/docs b/ubuntu/_base/applications/utilities/filelight/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/filelight/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/rules b/ubuntu/_base/applications/utilities/filelight/debian/rules
index 7bc15fb33..acec209eb 100755
--- a/ubuntu/_base/applications/utilities/filelight/debian/rules
+++ b/ubuntu/_base/applications/utilities/filelight/debian/rules
@@ -5,8 +5,7 @@
 # see /usr/share/common-licenses/GPL-2 for details.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_DH_ALWAYS_EXCLUDE=.svn
 
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/compat
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control
index 1aba23e5f..0248246e8 100644
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/control
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbarcode-trinity
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/rules b/ubuntu/_base/applications/utilities/kbarcode/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/rules
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
index 90312196c..0f024010c 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/control
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libchm-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libchm-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
index 1ed9b5bd5..b72409e5a 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 FAQ
-README
+README.md
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/rules b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/compat b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/compat
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control
index 103ad3799..dec935117 100644
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/control
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kcpuload-trinity
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/rules b/ubuntu/_base/applications/utilities/kcpuload/debian/rules
index f39393c74..f38aa8f52 100755
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/rules
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/rules
@@ -3,8 +3,7 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/compat
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control
index cd70dab54..40838edc5 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/control
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
 Section: misc
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kdirstat.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/docs b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
index 7f03542b1..871711684 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/docs
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 CREDITS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/rules b/ubuntu/_base/applications/utilities/kdirstat/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/rules
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/keep/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/compat
+++ b/ubuntu/_base/applications/utilities/keep/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control
index ba782249c..f2d809119 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/control
+++ b/ubuntu/_base/applications/utilities/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity
diff --git a/ubuntu/_base/applications/utilities/keep/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/docs
+++ b/ubuntu/_base/applications/utilities/keep/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/keep/debian/rules b/ubuntu/_base/applications/utilities/keep/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/utilities/keep/debian/rules
+++ b/ubuntu/_base/applications/utilities/keep/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/compat
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control
index abf0e03fa..acc183730 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/control
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Homepage: http://www.knut.noveradsl.cz/knutclient/
 
 Package: knutclient-trinity
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/docs b/ubuntu/_base/applications/utilities/knutclient/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/docs
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/rules b/ubuntu/_base/applications/utilities/knutclient/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/utilities/knutclient/debian/rules
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/changelog b/ubuntu/_base/applications/utilities/kommando/debian/changelog
new file mode 100644
index 000000000..6259ef8bc
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/changelog
@@ -0,0 +1,67 @@
+kommando-trinity (0.5.2-0) unstable; urgency=low
+
+  * Trinity version
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 23 Jul 2023 11:50:46 +0900
+
+kommando (0.5.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Sune Vuorela <debian@pusling.com>  Fri, 13 Apr 2007 23:49:21 +0200
+
+kommando (0.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Removing kommandorc from root of tarball.
+  * Removing patch to move conffile. Integrated upstream.
+  * kommando is now a kded module, not a stand alone program. 
+    - menu file removed. 
+    - man page removed. 
+    - NEWS.Debian added.
+
+ -- Sune Vuorela <debian@pusling.com>  Thu, 28 Dec 2006 16:47:01 +0100
+
+kommando (0.4.1-2) unstable; urgency=low
+
+  * Fixed problems with moving of kommandorc
+
+ -- Sune Vuorela <debian@pusling.com>  Sun, 29 Jan 2006 19:54:32 +0100
+
+kommando (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Fri, 27 Jan 2006 22:26:33 +0000
+
+kommando (0.4.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 25 Jan 2006 22:06:50 +0000
+
+kommando (0.3.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Sat, 19 Nov 2005 22:35:44 +0000
+
+kommando (0.2-2) unstable; urgency=low
+
+  * Passes lintian
+  * First debian release Closes: #336607
+
+ -- Sune Vuorela <debian@pusling.com>  Tue,  1 Nov 2005 13:00:00 +0100
+
+kommando (0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Sun,  2 Oct 2005 21:51:18 +0000
+
+kommando (0.1.2-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Sune Vuorela <debian@pusling.com>  Tue, 27 Sep 2005 21:37:53 +0000
+
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/compat b/ubuntu/_base/applications/utilities/kommando/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/control b/ubuntu/_base/applications/utilities/kommando/debian/control
new file mode 100644
index 000000000..1d57e9a92
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/control
@@ -0,0 +1,15 @@
+Source: kommando-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxmu-dev
+Standards-Version: 3.8.4
+
+Package: kommando-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a TDE wheel-menu to quickly pick menu items with the mouse
+ It allows rapid access to user defined applications and shell 
+ commands and is of course a nice piece of eyecandy to improve the 
+ look and usability of TDE.
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/copyright b/ubuntu/_base/applications/utilities/kommando/debian/copyright
new file mode 100644
index 000000000..be9aabb0b
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/copyright
@@ -0,0 +1,39 @@
+This code was ported to TDE and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/kommando/0.5.1-/
+and from the KDE store:
+    https://store.kde.org/p/1081202/
+All original code was released under GPL2 license.
+
+Original code was packaged for Debian by:
+   Sune Vuorela <debian@pusling.com> on
+Tue, 27 Sep 2005 21:37:53 +0000.
+
+It was downloaded from http://www.kde-look.org/content/show.php?content=29514
+
+Copyright Holder (C) 2005,2006: Daniel Stoeckel <the_docter (at) gmx.net>
+
+License: 
+
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2005-2007, Sune Vuorela <debian@pusling.com> and
+is licensed under the GPL, see above.
+
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/docs b/ubuntu/_base/applications/utilities/kommando/debian/docs
index 6f83607c1..6f83607c1 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/docs
+++ b/ubuntu/_base/applications/utilities/kommando/debian/docs
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/patches/series b/ubuntu/_base/applications/utilities/kommando/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/patches/series
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/rules b/ubuntu/_base/applications/utilities/kommando/debian/rules
new file mode 100755
index 000000000..d8f798f1c
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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/applications/utilities/kommando/debian/source/format b/ubuntu/_base/applications/utilities/kommando/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/source/options b/ubuntu/_base/applications/utilities/kommando/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/compat b/ubuntu/_base/applications/utilities/kompose/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kompose/debian/compat
+++ b/ubuntu/_base/applications/utilities/kompose/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/control b/ubuntu/_base/applications/utilities/kompose/debian/control
index 86be6e3a1..b9ac9d208 100644
--- a/ubuntu/_base/applications/utilities/kompose/debian/control
+++ b/ubuntu/_base/applications/utilities/kompose/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev
 Standards-Version: 3.8.4
 
 Package: kompose-trinity
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/rules b/ubuntu/_base/applications/utilities/kompose/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/applications/utilities/kompose/debian/rules
+++ b/ubuntu/_base/applications/utilities/kompose/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/krename/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/compat
+++ b/ubuntu/_base/applications/utilities/krename/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control
index e6add2a1c..a7af17c0d 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/control
+++ b/ubuntu/_base/applications/utilities/krename/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Richard A. Johnson <nixternal@ubuntu.com> 
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
 Standards-Version: 3.8.4
 
 Package: krename-trinity
diff --git a/ubuntu/_base/applications/utilities/krename/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/docs
+++ b/ubuntu/_base/applications/utilities/krename/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/krename/debian/rules b/ubuntu/_base/applications/utilities/krename/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/utilities/krename/debian/rules
+++ b/ubuntu/_base/applications/utilities/krename/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/compat b/ubuntu/_base/applications/utilities/ksensors/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/compat
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/control b/ubuntu/_base/applications/utilities/ksensors/debian/control
index 8212563ba..a9fffae5f 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/control
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/control
@@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsensors-dev | libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/docs b/ubuntu/_base/applications/utilities/ksensors/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/docs
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/rules b/ubuntu/_base/applications/utilities/ksensors/debian/rules
index 4437933c3..a866baea2 100755
--- a/ubuntu/_base/applications/utilities/ksensors/debian/rules
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/compat b/ubuntu/_base/applications/utilities/mathemagics/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/compat
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/control b/ubuntu/_base/applications/utilities/mathemagics/debian/control
index 84de6a15a..c82a2f33c 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/control
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/control
@@ -2,7 +2,7 @@ Source: mathemagics-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: mathemagics-trinity
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/docs b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/docs
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/rules b/ubuntu/_base/applications/utilities/mathemagics/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/rules
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
index dc6bfaba3..612765088 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Vincent Legout <vincent@legout.info>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
 Standards-Version: 3.8.4
 Homepage: http://qalculate.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
index a6797f19a..d8f798f1c 100755
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/common/cmake/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/common/cmake/debian/cdbs/versions.pl b/ubuntu/_base/common/cmake/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/common/cmake/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/common/cmake/debian/compat b/ubuntu/_base/common/cmake/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/common/cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/core/tde-i18n/debian/compat b/ubuntu/_base/core/tde-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tde-i18n/debian/compat
+++ b/ubuntu/_base/core/tde-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control
index f5b6bb982..33461f159 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control
+++ b/ubuntu/_base/core/tde-i18n/debian/control
@@ -2,7 +2,7 @@ Source: tde-i18n-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tde-i18n-trinity
@@ -10,7 +10,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-trinity (<< 4:14.0.0~)
 Breaks: kde-i18n-trinity (<< 4:14.0.0~)
-Depends: tdelibs14-trinity
+Depends: tdelibs-trinity
 Suggests: tde-trinity
 Provides: tde-i18n-trinity
 Description: All languages (all) internationalized (i18n) files for TDE
diff --git a/ubuntu/_base/core/tde-i18n/debian/control-lang b/ubuntu/_base/core/tde-i18n/debian/control-lang
index 5d409c28d..2fce8baf8 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control-lang
+++ b/ubuntu/_base/core/tde-i18n/debian/control-lang
@@ -4,7 +4,7 @@ Architecture: all
 Section: tde
 Replaces: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~)
 Breaks: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~)
-Depends: tdelibs14-trinity
+Depends: tdelibs-trinity
 Suggests: tde-trinity
 Provides: tde-i18n-trinity
 Description: @lang_desc@ (@lang@) internationalized (i18n) files for TDE
diff --git a/ubuntu/_base/core/tde-i18n/debian/control-source b/ubuntu/_base/core/tde-i18n/debian/control-source
index 984fed2a5..b959dad00 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control-source
+++ b/ubuntu/_base/core/tde-i18n/debian/control-source
@@ -2,5 +2,5 @@ Source: tde-i18n-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules
index 0daf98a6d..900b2d86e 100755
--- a/ubuntu/_base/core/tde-i18n/debian/rules
+++ b/ubuntu/_base/core/tde-i18n/debian/rules
@@ -150,6 +150,7 @@ binary-indep: build install
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
+	dh_link
 	dh_strip
 	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
 	dh_strip_nondeterminism)
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/compat b/ubuntu/_base/core/tdeaccessibility/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/compat
+++ b/ubuntu/_base/core/tdeaccessibility/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control
index ca1a83529..fb4d11c7f 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, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, 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/rules b/ubuntu/_base/core/tdeaccessibility/debian/rules
index 2748fa452..8f158ca6e 100755
--- a/ubuntu/_base/core/tdeaccessibility/debian/rules
+++ b/ubuntu/_base/core/tdeaccessibility/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 #DEB_MAKE_CHECK_TARGET = check
 
diff --git a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
index aff5ed18a..e01f62f5d 100644
--- a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
@@ -5,3 +5,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/atlantikdesigner
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/atlantikdesigner.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/atlantikdesigner.png
 debian/icons/atlantikdesigner.xpm /opt/trinity/share/pixmaps
+debian/tmp/opt/trinity/share/man/man1/atlantikdesigner.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
deleted file mode 100644
index f0b5385f4..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/atlantikdesigner-trinity.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeaddons/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeaddons/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeaddons/debian/compat b/ubuntu/_base/core/tdeaddons/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeaddons/debian/compat
+++ b/ubuntu/_base/core/tdeaddons/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeaddons/debian/control b/ubuntu/_base/core/tdeaddons/debian/control
index b73c4c501..d3bb906a6 100644
--- a/ubuntu/_base/core/tdeaddons/debian/control
+++ b/ubuntu/_base/core/tdeaddons/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>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb++-dev | libdb5.3++-dev | libdb4.8++-dev, libogg-dev, dh-python
 Standards-Version: 3.8.4
 
 Package: tdeaddons-trinity
@@ -152,7 +152,7 @@ Architecture: all
 Section: tde
 Replaces: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~)
 Breaks: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
+Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
 Recommends: knewsticker-trinity
 Enhances: knewsticker-trinity
 Description: scripts for KNewsTicker, the Trinity news ticker
@@ -171,7 +171,7 @@ Architecture: any
 Section: tde
 Replaces: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~)
 Breaks: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison
+Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison
 Recommends: akregator-trinity, ark-trinity, imagemagick
 Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
diff --git a/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian
deleted file mode 100644
index 705d74139..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# Call is inserted by debhelper and is correct.
-kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
-kicker-applets-trinity: postrm-has-useless-call-to-ldconfig
diff --git a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
index 804176757..9b30b940a 100644
--- a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
@@ -163,6 +163,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/metabar.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+debian/tmp/opt/trinity/share/man/man1/exif.py.1
+debian/tmp/opt/trinity/share/man/man1/fsview.1
+debian/tmp/opt/trinity/share/man/man1/jpegorient.1
+debian/tmp/opt/trinity/share/man/man1/orient.py.1
 debian/tmp/opt/trinity/share/services/akregator_konqplugin.desktop
 debian/tmp/opt/trinity/share/services/ark_plugin.desktop
 debian/tmp/opt/trinity/share/services/fsview_part.desktop
diff --git a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
deleted file mode 100644
index b33b9ee5a..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/exif-trinity.py.1
-debian/man/fsview-trinity.1
-debian/man/jpegorient-trinity.1
-debian/man/orient-trinity.py.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
index 10959a93a..94b1c6d7f 100644
--- a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
@@ -8,3 +8,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/screenshot.png
+debian/tmp/opt/trinity/share/man/man1/ksig.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages
deleted file mode 100644
index 2b3ef735d..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksig-trinity.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
deleted file mode 100644
index 41a1aeb2b..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ /dev/null
@@ -1,42 +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 ATLANTIKDESIGNER 1 "October 14, 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
-atlantikdesigner \- game board designer for Atlantik
-.SH SYNOPSIS
-.B atlantikdesigner
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBAtlantik Designer\fP is a game board designer for Atlantik.
-.PP
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
-.SH SEE ALSO
-.BR atlantik (6).
-.SH AUTHOR
-Atlantik Designer was written by Jason Katz-Brown <jason@katzbrown.com>
-and Rob Kaper <cap@capsi.com>.
-.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/tdeaddons/debian/man/exif-trinity.py.1 b/ubuntu/_base/core/tdeaddons/debian/man/exif-trinity.py.1
deleted file mode 100644
index 73179046f..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/exif-trinity.py.1
+++ /dev/null
@@ -1,44 +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 EXIF.PY 1 "February 4, 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
-exif.py \- extract EXIF information from digital camera image files
-.SH SYNOPSIS
-.B exif.py
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a Python library for extracting EXIF tags from digital camera
-image files.  It contains a command-line testing and debugging interface,
-which reads EXIF tags from the given files and dumps them to the
-console.
-.PP
-This library is provided with the image conversion and transformation
-plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
-part of the same set of plugins, makes use of this library.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH SEE ALSO
-.BR jpegorient (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The EXIF extraction library was written by Thierry Bousch
-<bousch@topo.math.u-psud.fr>, Gene Cash <gcash@cfl.rr.com> and
-Leif Jensen <jensen@math.columbia.edu>.
-.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/tdeaddons/debian/man/fsview-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/fsview-trinity.1
deleted file mode 100644
index a1dd43b20..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/fsview-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 FSVIEW 1 "February 4, 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
-fsview \- a filesystem viewer that graphically shows disk usage
-.SH SYNOPSIS
-.B fsview
-.RI "[ " generic-options " ]"
-[ \fIfolder\fP ]
-.SH DESCRIPTION
-\fBFSView\fP is a tool for showing disc utilization in a graphical form, much
-like the UNIX command 'du'.  The visualisation type chosen is a
-treemap.  Each directory is represented by a rectangle whose area is
-proportional to its size.  Each directory rectangle contains smaller
-rectangles for its contents, and so on down.
-.PP
-FSView is provided both as a Konqueror plugin for viewing directories,
-and as a standalone executable.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the fsview-specific options.
-For a full summary of options, run \fIfsview \-\-help\fP.
-.TP
-\fIfolder\fP
-View the filesystem starting from this folder.
-.SH SEE ALSO
-.BR du (1),
-.BR kdirstat (1),
-.BR konqueror (1).
-.PP
-For a full featured graphical 'du', see KDirStat.  It's quite similar
-to FSView, but allows for lot of cleanup actions.
-.SH AUTHOR
-FSView was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.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/tdeaddons/debian/man/jpegorient-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
deleted file mode 100644
index 3317c868c..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
+++ /dev/null
@@ -1,68 +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 JPEGORIENT 1 "October 13, 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
-jpegorient \- change the orientations of JPEG images
-.SH SYNOPSIS
-.B jpegorient
-{ \fB\-90\fP | \fB\-180\fP | \fB\-270\fP | \fB\-v\fP | \fB\-h\fP }
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a simple utility for changing the orientations of one or more
-JPEG images.
-It is provided as part of the image conversion and transformation
-plugins for Konqueror.
-.PP
-A single option must be passed before any filenames to specify how the
-orientations of the images are to be changed.  Each new image will be
-saved over the old one.
-.PP
-This utility makes use of
-.BR orient.py (1),
-which is designed to work with certain types of digital camera image
-files.  Instead of modifying the image data, it alters the EXIF
-tags stored with the image to reflect the new orientation.  For this
-reason only images with the correct types of EXIF tags can be changed
-using this tool.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-.TP
-\fB\-90\fP
-Rotate each image by 90 degrees clockwise.
-.TP
-\fB\-180\fP
-Rotate each image by a half turn (i.e., 180 degrees).
-.TP
-\fB\-270\fP
-Rotate each image by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.TP
-\fB\-v\fP
-Flip each image vertically.
-.TP
-\fB\-h\fP
-Flip each image horizontally.
-.SH SEE ALSO
-.BR exif.py (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.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/tdeaddons/debian/man/ksig-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/ksig-trinity.1
deleted file mode 100644
index 5c0ec94b5..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/ksig-trinity.1
+++ /dev/null
@@ -1,59 +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 KSIG 1 "February 4, 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
-ksig \- a graphical tool for managing multiple email signatures
-.SH SYNOPSIS
-.B ksig
-.RI "[ " generic-options " ]"
-[ \fB\-\-random\fP | \fB\-\-daily\fP ]
-.SH DESCRIPTION
-\fBKSig\fP is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  This is done by starting KSig in the usual way
-through the menus, or by running KSig without either of the special
-options \-\-random or \-\-daily.
-.PP
-A direct command-line interface is then available for generating random
-or daily signatures from this list.  This is achieved by running KSig
-with one of the options \-\-random or \-\-daily, both of which are
-described below.
-.PP
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.  See
-\fI/opt/trinity/share/doc/ksig/README.Debian\fP for details on how this can be
-done.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the ksig-specific options.
-For a full summary of options, run \fIksig \-\-help\fP.
-.TP
-\fB\-\-random\fP
-Write a random signature from the list to the console.
-.TP
-\fB\-\-daily\fP
-Write a signature for the day to the console.  The signature will change
-from day to day, but multiple calls on the same day will always return
-the same signature.
-.SH SEE ALSO
-.BR kmail (1).
-.SH AUTHOR
-KSig was written by Scott Wheeler <wheeler@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/tdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
deleted file mode 100644
index 692d6182a..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
+++ /dev/null
@@ -1,60 +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 LNKFORWARD 1 "October 23, 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
-lnkforward \- open an URL in a Windows .lnk file under TDE
-.SH SYNOPSIS
-.B lnkforward
-[ \fIgeneric-options\fP ]
-[ \fB\-\-map\fP \fIdrive\fP=\fIpath\fP ... ]
-\fIURL\fP
-.SH DESCRIPTION
-\fBlnkforward\fP examines a Windows .lnk file, determines its target and
-then opens this target file.  In deciding how to open the target file,
-the usual TDE file associations will be used.
-.PP
-The given URL must include a protocol.  Specifically, if it is simply a
-file on the local filesystem, it must be given in the form
-\fIfile:/path/to/file.lnk\fP.
-.PP
-Drive mappings must be supplied (via \-\-map) for any Windows drive
-referred to in the .lnk file.  See the OPTIONS section below for details.
-.PP
-This utility is used by the .lnk tdefile plugin, and is
-part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the lnkforward-specific options.
-For a full summary of options, run \fIlnkforward \-\-help\fP.
-.TP
-\fB\-\-map\fP \fIdrive\fP=\fIpath\fP
-Map the given Windows drive to the given path on the local filesystem
-(generally its mount point).
-This option may be passed multiple times.
-.SH EXAMPLE
-Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
-\fId:\\foo\\bar.txt\fP.  Then the following command will open the file
-\fI/mnt/data/foo/bar.txt\fP in the usual TDE text editor:
-.PP
-.RS
-\fIprompt$\fP
-lnkforward \-\-map c=/mnt/windows \-\-map d=/mnt/data /mnt/windows/readme.lnk
-.RE
-.SH AUTHOR
-This utility was written by Martin Koller <m.koller@surfeu.at>.
-.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/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
deleted file mode 100644
index fe860f1f8..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ /dev/null
@@ -1,38 +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 NOATUNSYNAESCOPE.BIN 1 "January 31, 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
-noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatunsynaescope.bin
-.SH DESCRIPTION
-This program starts the Synaescope visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Synaescope plugin was written by Charles Samuels <charles@kde.org>,
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au> et al.
-.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/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
deleted file mode 100644
index b33eb3b16..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ /dev/null
@@ -1,39 +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 NOATUNTIPPECANOE.BIN 1 "January 31, 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
-noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntippecanoe.bin
-.SH DESCRIPTION
-This program starts the Tippecanoe visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tippecanoe plugin was written by Neil Stevens <multivac@fcmail.com>,
-Charles Samuels <charles@kde.org> and
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.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/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
deleted file mode 100644
index 5a4001047..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ /dev/null
@@ -1,39 +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 NOATUNTYLER.BIN 1 "January 31, 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
-noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntyler.bin
-.SH DESCRIPTION
-This program starts the Tyler visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tyler plugin was written by Neil Stevens <multivac@fcmail.com>,
-Julien Carme <julien.carme@acm.org>, Charles Samuels <charles@kde.org>
-and Mitja Horvat <Mitja.Horvat@hermes.si>.
-.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/tdeaddons/debian/man/orient-trinity.py.1 b/ubuntu/_base/core/tdeaddons/debian/man/orient-trinity.py.1
deleted file mode 100644
index 024ec11d7..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/orient-trinity.py.1
+++ /dev/null
@@ -1,88 +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 ORIENT.PY 1 "October 13, 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
-orient.py \- change the orientation of a digital camera image file
-.SH SYNOPSIS
-.B orient.py
-.I image-file
-.br
-.B orient.py
-[1-8]
-.I image-file
-.SH DESCRIPTION
-This is a small script for changing the orientation of certain types
-of digital camera image files.  The image data is not modified, but
-rather the EXIF tags stored with the image are altered to reflect the
-new orientation.  For this reason only images with the correct types of
-EXIF tags can be changed using this script.
-.PP
-When called with with a numeric argument from 1 to 8, the orientation
-will be changed as described in the options section below.  When called
-with only a filename, the current orientation will be written to the
-console (also as a number from 1 to 8).
-.PP
-If the image contains no EXIF information or if the EXIF information is not
-of the correct type, an error will be displayed and this script will
-exit immediately.
-.PP
-This script is provided with the image conversion and transformation
-plugins for Konqueror.  For a more general-purpose JPEG rotation/reflection
-tool, see
-.BR jpegorient (1)
-which is also a part of this same set of plugins.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-The possible orientations are represented by the numbers 1 to 8 as
-follows.
-.TP
-.B 1
-No change of orientation.
-.TP
-.B 2
-Flip horizontally.
-.TP
-.B 3
-Rotate by a half turn (i.e., 180 degrees).
-.TP
-.B 4
-Flip vertically.
-.TP
-.B 5
-Transpose image (i.e., reflect across the upper-left to lower-right
-diagonal axis).
-.TP
-.B 6
-Rotate by 90 degrees clockwise.
-.TP
-.B 7
-Transverse transpose image (i.e., reflect across the upper-right to
-lower-left diagonal axis).
-.TP
-.B 8
-Rotate by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.SH SEE ALSO
-.BR exif.py (1),
-.BR jpegorient (1),
-.BR konqueror (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.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/tdeaddons/debian/noatun-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..7ae7d70de 100644
--- a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
@@ -51,6 +51,9 @@ debian/tmp/opt/trinity/share/apps/noatun/tylerstates
 debian/tmp/opt/trinity/share/apps/noatun/wakeup.plugin
 debian/tmp/opt/trinity/share/apps/noatun/wavecapture.plugin
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/synaescope.png
+debian/tmp/opt/trinity/share/man/man1/noatunsynaescope.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntippecanoe.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntyler.bin.1
 noatun-plugins/dub/AUTHORS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/BUGS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/ChangeLog /opt/trinity/share/doc/noatun-plugins/dub
diff --git a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
deleted file mode 100644
index 76a3fc35b..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/noatunsynaescope-trinity.bin.1
-debian/man/noatuntippecanoe-trinity.bin.1
-debian/man/noatuntyler-trinity.bin.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules
index 4d8d960f3..9f60552e2 100755
--- a/ubuntu/_base/core/tdeaddons/debian/rules
+++ b/ubuntu/_base/core/tdeaddons/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -20,23 +19,17 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
-binary-install/konq-plugins-trinity::
-	mkdir -p debian/konq-plugins-trinity/opt/trinity/share/
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man debian/konq-plugins-trinity/opt/trinity/share/
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/exif.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/exif.py.1; \
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/orient.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
-
 binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
-		debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
 
 binary-install/knewsticker-scripts-trinity::
-	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
-	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.py
+	chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.pl
+	chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.py
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/knewsticker/scripts
 
 binary-install/kate-plugins-trinity::
-	chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh
+	chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kate/scripts/html-tidy.sh
+
+binary-install/konq-plugins-trinity::
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/imagerotation
diff --git a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
index 70f735948..a666d9166 100644
--- a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
 debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/opt/trinity/share/man/man1/lnkforward.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
 debian/tmp/opt/trinity/share/services/tdefile_cert.desktop
 debian/tmp/opt/trinity/share/services/tdefile_desktop.desktop
diff --git a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
deleted file mode 100644
index eda9949fb..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/lnkforward-trinity.1
diff --git a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeadmin/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeadmin/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeadmin/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeadmin/debian/compat b/ubuntu/_base/core/tdeadmin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeadmin/debian/compat
+++ b/ubuntu/_base/core/tdeadmin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeadmin/debian/control b/ubuntu/_base/core/tdeadmin/debian/control
index 016c24273..f7174224e 100644
--- a/ubuntu/_base/core/tdeadmin/debian/control
+++ b/ubuntu/_base/core/tdeadmin/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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man
 Standards-Version: 3.8.4
 
 Package: tdeadmin-trinity
diff --git a/ubuntu/_base/core/tdeadmin/debian/rules b/ubuntu/_base/core/tdeadmin/debian/rules
index 21bc8b8ec..f29f55372 100755
--- a/ubuntu/_base/core/tdeadmin/debian/rules
+++ b/ubuntu/_base/core/tdeadmin/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdeadmin-trinity-dbg
 
diff --git a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeartwork/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeartwork/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeartwork/debian/compat b/ubuntu/_base/core/tdeartwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeartwork/debian/compat
+++ b/ubuntu/_base/core/tdeartwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeartwork/debian/control b/ubuntu/_base/core/tdeartwork/debian/control
index 00f306f34..a75dcf99d 100644
--- a/ubuntu/_base/core/tdeartwork/debian/control
+++ b/ubuntu/_base/core/tdeartwork/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>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
deleted file mode 100644
index d8cc7f4f6..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KBANNER.KSS 1 "January 30, 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
-kbanner.kss \- Banner screen saver for TDE
-.SH SYNOPSIS
-.B kbanner.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBanner\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkbanner.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and others.
-.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/tdeartwork/debian/man/kblob-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
deleted file mode 100644
index d3d2b9394..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KBLOB.KSS 1 "May 12, 2003"
-.\" 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
-kblob.kss \- Blob screen saver for TDE
-.SH SYNOPSIS
-.B kblob.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBlob\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkblob.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Tiaan Wessels <tiaan@netsys.co.za>.
-.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/tdeartwork/debian/man/kclock-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
deleted file mode 100644
index 03c795709..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KCLOCK.KSS 1 "January 30, 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
-kclock.kss \- Clock screen saver for TDE
-.SH SYNOPSIS
-.B kclock.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBClock\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkclock.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Melchior Franz <mfranz@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/tdeartwork/debian/man/keuphoria-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
deleted file mode 100644
index c8fb549b8..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KEUPHORIA.KSS 1 "May 12, 2003"
-.\" 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
-keuphoria.kss \- Euphoria screen saver for TDE
-.SH SYNOPSIS
-.B keuphoria.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBEuphoria\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkeuphoria.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.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/tdeartwork/debian/man/kfiresaver-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
deleted file mode 100644
index 58f427ba4..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.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 KFIRESAVER.KSS 1 "October 13, 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
-kfiresaver.kss \- Fireworks 3D screen saver for TDE
-.SH SYNOPSIS
-.B kfiresaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFireworks 3D\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfiresaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Enrico Ros <asy@libero.it> and
-David Sansome.
-.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/tdeartwork/debian/man/kflux-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
deleted file mode 100644
index 3556a7bc3..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KFLUX.KSS 1 "May 12, 2003"
-.\" 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
-kflux.kss \- Flux screen saver for TDE
-.SH SYNOPSIS
-.B kflux.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFlux\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkflux.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.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/tdeartwork/debian/man/kfountain-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1
deleted file mode 100644
index 9aa452ded..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.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 KFOUNTAIN.KSS 1 "May 12, 2003"
-.\" 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
-kfountain.kss \- Particle Fountain screen saver for TDE
-.SH SYNOPSIS
-.B kfountain.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Fountain\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfountain.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.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/tdeartwork/debian/man/kgravity-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1
deleted file mode 100644
index f7789052b..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.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 KGRAVITY.KSS 1 "May 12, 2003"
-.\" 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
-kgravity.kss \- Particle Gravity screen saver for TDE
-.SH SYNOPSIS
-.B kgravity.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Gravity\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkgravity.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.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/tdeartwork/debian/man/klines-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/klines-trinity.kss.1
deleted file mode 100644
index 6121f8e2d..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/klines-trinity.kss.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 KLINES.KSS 1 "January 30, 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
-klines.kss \- Lines screen saver for TDE
-.SH SYNOPSIS
-.B klines.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLines\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklines.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by
-Dirk Staneker <dirk.stanerker@student.uni-tuebingen.de>,
-Martin R. Jones <mjones@kde.org> and Mario Weilguni <mweilguni@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/tdeartwork/debian/man/klorenz-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
deleted file mode 100644
index 3df447a64..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KLORENZ.KSS 1 "January 30, 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
-klorenz.kss \- Lorenz Attractor screen saver for TDE
-.SH SYNOPSIS
-.B klorenz.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLorenz Attractor\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklorenz.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Nicolas Brodu <brodu@kde.org> and others.
-.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/tdeartwork/debian/man/kpendulum-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
deleted file mode 100644
index d253f4189..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.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 KPENDULUM.KSS 1 "October 13, 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
-kpendulum.kss \- Pendulum screen saver for TDE
-.SH SYNOPSIS
-.B kpendulum.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPendulum\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a two-part pendulum.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpendulum.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@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/tdeartwork/debian/man/kpolygon-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
deleted file mode 100644
index bc7e56868..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.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 KPOLYGON.KSS 1 "January 30, 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
-kpolygon.kss \- Polygons screen saver for TDE
-.SH SYNOPSIS
-.B kpolygon.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPolygons\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpolygon.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and
-Mario Weilguni <mweilguni@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/tdeartwork/debian/man/krotation-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1
deleted file mode 100644
index 6bc0c172b..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/krotation-trinity.kss.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 KROTATION.KSS 1 "October 13, 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
-krotation.kss \- Rotation screen saver for TDE
-.SH SYNOPSIS
-.B krotation.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBRotation\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a force free rotating asymmetric body.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkrotation.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@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/tdeartwork/debian/man/kscience-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
deleted file mode 100644
index 061374a15..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KSCIENCE.KSS 1 "May 12, 2003"
-.\" 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
-kscience.kss \- Science screen saver for TDE
-.SH SYNOPSIS
-.B kscience.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBScience\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkscience.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Rene Beutler <rbeutler@g26.ethz.ch>.
-.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/tdeartwork/debian/man/kslideshow-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
deleted file mode 100644
index c8b208e0d..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.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 KSLIDESHOW.KSS 1 "January 30, 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
-kslideshow.kss \- Slide Show screen saver for TDE
-.SH SYNOPSIS
-.B kslideshow.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSlide Show\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkslideshow.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Taferner <taferner@kde.org>,
-Martin R. Jones <mjones@kde.org>, Chris Howells <howells@kde.org>
-and Sven Leiber <s.leiber@web.de>.
-.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/tdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
deleted file mode 100644
index 8555d6209..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KSOLARWINDS.KSS 1 "May 12, 2003"
-.\" 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
-ksolarwinds.kss \- Solar Winds screen saver for TDE
-.SH SYNOPSIS
-.B ksolarwinds.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSolar Winds\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIksolarwinds.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.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/tdeartwork/debian/man/kspace-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1
deleted file mode 100644
index 1e39ff18e..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kspace-trinity.kss.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 KSPACE.KSS 1 "May 12, 2003"
-.\" 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
-kspace.kss \- Space screen saver for TDE
-.SH SYNOPSIS
-.B kspace.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSpace\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkspace.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Bernd Johannes Wuebben
-<wuebben@math.cornell.edu> and Silicon Graphics, Inc.
-.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/tdeartwork/debian/man/kswarm-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1
deleted file mode 100644
index ea1e0d653..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.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 KSWARM.KSS 1 "October 13, 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
-kswarm.kss \- Swarm screen saver for TDE
-.SH SYNOPSIS
-.B kswarm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSwarm\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkswarm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Patrick J. Naughton,
-Emanuel Pirker <epirker@edu.uni-klu.ac.at>,
-Jeff Butterworth <butterwo@ncsc.org> and Mario Weilguni <mweilguni@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/tdeartwork/debian/man/kvm-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1
deleted file mode 100644
index a7e037cbe..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kvm-trinity.kss.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 KVM.KSS 1 "May 12, 2003"
-.\" 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
-kvm.kss \- Virtual Machine screen saver for TDE
-.SH SYNOPSIS
-.B kvm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBVirtual Machine\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkvm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Artur Rataj <art@zeus.polsl.gliwice.pl>,
-Eric Plante and Jamie Zawinski <jwz@jwz.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/tdeartwork/debian/man/kwave-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1
deleted file mode 100644
index 8ad59b9c1..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kwave-trinity.kss.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 KWAVE.KSS 1 "May 12, 2003"
-.\" 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
-kwave.kss \- Bitmap Wave screen saver for TDE
-.SH SYNOPSIS
-.B kwave.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBitmap Wave\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkwave.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>
-and Jeff Molofee <nehe@connect.ab.ca>.
-.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/tdeartwork/debian/man/kxsconfig-trinity.1 b/ubuntu/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
deleted file mode 100644
index f4cd67694..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
+++ /dev/null
@@ -1,50 +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 KXSCONFIG 1 "October 13, 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
-kxsconfig \- TDE X screen saver configuration tool
-.SH SYNOPSIS
-.B kxsconfig
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fIsavername\fP ]
-.SH DESCRIPTION
-\fBkxsconfig\fP is a screen saver configuration tool
-for the Trinity Desktop Environment (TDE).  It is used to configure generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsconfig-specific options.
-For a full summary of options, run \fIkxsconfig \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to configure.
-.TP
-\fIsavername\fP
-An optional human-readable screen saver name to use in messages.
-.SH EXAMPLES
-\fIexample$\fP kxsconfig /usr/lib/xscreensaver/bouboule Bouboule
-.SH SEE ALSO
-.BR kxsrun (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.  It also
-makes use of xscreensaver code written by Jamie Zawinski <jwz@jwz.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/tdeartwork/debian/man/kxsrun-trinity.1 b/ubuntu/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
deleted file mode 100644
index 9e45a775c..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
+++ /dev/null
@@ -1,49 +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 KXSRUN 1 "May 12, 2003"
-.\" 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
-kxsrun \- TDE X screen saver launcher
-.SH SYNOPSIS
-.B kxsrun
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fB\-\-\fP \fIoptions\fP ]
-.SH DESCRIPTION
-\fBkxsrun\fP is a screen saver launcher
-for the Trinity Desktop Environment (TDE).  It is used to launch generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsrun-specific options.
-For a full summary of options, run \fIkxsrun \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to launch.
-.TP
-\fB\-\-\fP \fIoptions\fP
-Additional options to pass to the screen saver.
-.SH EXAMPLES
-\fIexample$\fP kxsrun /usr/lib/xscreensaver/bouboule
-.SH SEE ALSO
-.BR kxsconfig (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@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/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
deleted file mode 100644
index 2eb943ee2..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
+++ /dev/null
@@ -1,57 +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 TDEASCIIQUARIUM.KSS 1 "May 21, 2021"
-.\" 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
-tdeasciiquarium.kss \- TDE screensaver to draw an ASCII art aquarium
-.SH SYNOPSIS
-.B tdeasciiquarium.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBTDEAsciiquarium\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It draws an ASCII art aquarium.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdeasciiquarium.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-Native TDE Screensaver based on the Asciiquarium program
-from Kirk Baucom <kbaucom@schizoid.com>, available at
-http://www.robobunny.com/projects/asciiquarium.
-.br
-Ported to TDE by Maksim Orlovich <maksim@kde.org> and
-Michael Pyne <michael.pyne@kdemail.net>.
-.br
-This manual page was prepared by Michele Calgaro <michele.calgaro@yahoo.it>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
deleted file mode 100644
index 00b4d4c58..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
+++ /dev/null
@@ -1,51 +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 KPARTSAVER.KSS 1 "May 12, 2003"
-.\" 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
-tdepartsaver.kss \- Media screen saver for TDE
-.SH SYNOPSIS
-.B tdepartsaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBMedia\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Schimanski <1Stein@gmx.de>.
-.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/tdeartwork/debian/rules b/ubuntu/_base/core/tdeartwork/debian/rules
index 184b8d284..a18626c89 100755
--- a/ubuntu/_base/core/tdeartwork/debian/rules
+++ b/ubuntu/_base/core/tdeartwork/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
index 1ae8e4bf3..b5a29f45c 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
@@ -44,3 +44,25 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdeasciiquarium.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/opt/trinity/share/apps/kfiresaver
 debian/tmp/opt/trinity/share/apps/tdescreensaver
+debian/tmp/opt/trinity/share/man/man1/kbanner.kss.1
+debian/tmp/opt/trinity/share/man/man1/kblob.kss.1
+debian/tmp/opt/trinity/share/man/man1/kclock.kss.1
+debian/tmp/opt/trinity/share/man/man1/keuphoria.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfiresaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kflux.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfountain.kss.1
+debian/tmp/opt/trinity/share/man/man1/kgravity.kss.1
+debian/tmp/opt/trinity/share/man/man1/klines.kss.1
+debian/tmp/opt/trinity/share/man/man1/klorenz.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdepartsaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpendulum.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpolygon.kss.1
+debian/tmp/opt/trinity/share/man/man1/krotation.kss.1
+debian/tmp/opt/trinity/share/man/man1/kscience.kss.1
+debian/tmp/opt/trinity/share/man/man1/kslideshow.kss.1
+debian/tmp/opt/trinity/share/man/man1/ksolarwinds.kss.1
+debian/tmp/opt/trinity/share/man/man1/kspace.kss.1
+debian/tmp/opt/trinity/share/man/man1/kswarm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kvm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kwave.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdeasciiquarium.kss.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
deleted file mode 100644
index dad73c192..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/man/kbanner-trinity.kss.1
-debian/man/kblob-trinity.kss.1
-debian/man/kclock-trinity.kss.1
-debian/man/keuphoria-trinity.kss.1
-debian/man/kfiresaver-trinity.kss.1
-debian/man/kflux-trinity.kss.1
-debian/man/kfountain-trinity.kss.1
-debian/man/kgravity-trinity.kss.1
-debian/man/klines-trinity.kss.1
-debian/man/klorenz-trinity.kss.1
-debian/man/tdepartsaver-trinity.kss.1
-debian/man/kpendulum-trinity.kss.1
-debian/man/kpolygon-trinity.kss.1
-debian/man/krotation-trinity.kss.1
-debian/man/kscience-trinity.kss.1
-debian/man/kslideshow-trinity.kss.1
-debian/man/ksolarwinds-trinity.kss.1
-debian/man/kspace-trinity.kss.1
-debian/man/kswarm-trinity.kss.1
-debian/man/kvm-trinity.kss.1
-debian/man/kwave-trinity.kss.1
-debian/man/tdeasciiquarium-trinity.kss.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 2657a6d03..f6ba5762d 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
@@ -64,9 +64,10 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lockward.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cwaves.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/topblock.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/voronoi.desktop
-
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cubicgrid.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/hypnowheel.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lcdscrub.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/photopile.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/skytentacles.desktop
+debian/tmp/opt/trinity/share/man/man1/kxsconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxsrun.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
deleted file mode 100644
index 356af4f32..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kxsconfig-trinity.1
-debian/man/kxsrun-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/versions.pl b/ubuntu/_base/core/tdebase/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdebase/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdebase/debian/compat b/ubuntu/_base/core/tdebase/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdebase/debian/compat
+++ b/ubuntu/_base/core/tdebase/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 651d7e4ea..a9ae82a2d 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -4,8 +4,8 @@ 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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libtirpc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
 
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
 Breaks: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
 Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${source:Version})
 Description: base components from the official TDE release
@@ -324,6 +324,7 @@ Architecture: any
 Replaces: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~)
 Breaks: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
+Recommends: desktop-file-utils
 Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~)
 Description: desktop panel for TDE
@@ -474,7 +475,7 @@ Replaces: ksmserver-kde3 (<< 4:14.0.0~), ksmserver-trinity (<< 4:14.0.0~)
 Breaks: ksmserver-kde3 (<< 4:14.0.0~), ksmserver-trinity (<< 4:14.0.0~)
 Provides: x-session-manager
 Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${source:Version}) | x-window-manager
-Recommends: kpersonalizer-trinity (= ${source:Version}), tde-ubuntu-integration
+Recommends: kpersonalizer-trinity (= ${source:Version}), polkit-agent-tde
 Description: session manager for TDE
  This package contains the TDE session manager. It is responsible for
  restoring your TDE session on login. It is also needed to properly
diff --git a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
index d99c8f055..eac5c8e50 100644
--- a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
@@ -211,6 +211,7 @@ debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kappfinder.png
+debian/tmp/opt/trinity/share/man/man1/kappfinder.1
 
 debian/icons/kappfinder.xpm		/opt/trinity/share/pixmaps
 debian/icons/kappfinder-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages
deleted file mode 100644
index b83ec9565..000000000
--- a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kappfinder-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kate-trinity.install b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
index 93c4a1b87..9e8dc8111 100644
--- a/ubuntu/_base/core/tdebase/debian/kate-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
@@ -19,14 +19,12 @@ debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/highlighti
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png
-debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/null.png
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/indent.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modified.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modmod.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modonhd.png
-debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/null.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/unindent.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/indent.png
 debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/unindent.png
@@ -60,6 +58,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kate.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kwrite.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kate2.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/opt/trinity/share/man/man1/kate.1
+debian/tmp/opt/trinity/share/man/man1/kwrite.1
 debian/tmp/opt/trinity/share/servicetypes/kateplugin.desktop
 
 debian/icons/kate-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages
deleted file mode 100644
index 56b772103..000000000
--- a/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kate-trinity.1
-debian/man/kwrite-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
index aa5629dfe..fb1838b85 100644
--- a/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
@@ -5,9 +5,10 @@ debian/tmp/opt/trinity/bin/keditfiletype
 debian/tmp/opt/trinity/bin/tdefontinst
 debian/tmp/opt/trinity/bin/tdefontview
 debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper
-debian/tmp/opt/trinity/bin/tderandrtray
-debian/tmp/opt/trinity/bin/tdehwdevicetray
 debian/tmp/opt/trinity/bin/krdb
+debian/tmp/opt/trinity/bin/tdehwdevicetray
+debian/tmp/opt/trinity/bin/tderandrtray
+debian/tmp/opt/trinity/bin/tdesyndaemon
 debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so
 debian/tmp/opt/trinity/lib/trinity/kaccess.la
@@ -195,6 +196,7 @@ debian/tmp/opt/trinity/share/applications/tde/smbstatus.desktop
 debian/tmp/opt/trinity/share/applications/tde/sound.desktop
 debian/tmp/opt/trinity/share/applications/tde/spellchecking.desktop
 debian/tmp/opt/trinity/share/applications/tde/style.desktop
+debian/tmp/opt/trinity/share/applications/tde/touchpad.desktop
 debian/tmp/opt/trinity/share/applications/tde/useragent.desktop
 debian/tmp/opt/trinity/share/applications/tde/xserver.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/energy.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst
deleted file mode 100644
index 0b3eb0b52..000000000
--- a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kdesktop-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/kfind-trinity.install b/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
index 3c02d8aae..b17c5eebb 100644
--- a/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kfind.png
+debian/tmp/opt/trinity/share/man/man1/kfind.1
 debian/tmp/opt/trinity/share/services/kfindpart.desktop
 debian/tmp/opt/trinity/share/servicetypes/findpart.desktop
 
diff --git a/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages
deleted file mode 100644
index f0e6d9c78..000000000
--- a/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfind-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install
index 96fce70e1..4e883cb6b 100644
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/man9.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/mann.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/support.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/quickstart.desktop
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/releasenotes.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/visualdict.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/userguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/welcome.desktop
@@ -99,6 +100,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docboo
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
index 3a278bff7..c57f28095 100644
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1 @@
 khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst
deleted file mode 100644
index b6b0656b7..000000000
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for khelpcenter-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/kicker-trinity.install b/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
index 839bdc565..c9cd96420 100644
--- a/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
@@ -259,6 +259,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/systemtray.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/taskbar.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+debian/tmp/opt/trinity/share/man/man1/appletproxy.1
+debian/tmp/opt/trinity/share/man/man1/extensionproxy.1
+debian/tmp/opt/trinity/share/man/man1/kasbar.1
+debian/tmp/opt/trinity/share/man/man1/kicker.1
 
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/suspend2disk.png
diff --git a/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages
deleted file mode 100644
index 399a3843c..000000000
--- a/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/appletproxy-trinity.1
-debian/man/extensionproxy-trinity.1
-debian/man/kasbar-trinity.1
-debian/man/kicker-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install
index 719b878c8..4231a3aae 100644
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install
@@ -6,6 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
 debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/tde/klipper.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/copy-full-path.desktop
 debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-1-2.pl
 debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-trinity1.sh
 debian/tmp/opt/trinity/share/apps/tdeconf_update/klipperrc.upd
diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
index bee8b8020..c46e478c8 100644
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1 @@
 klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst
deleted file mode 100644
index b2c57de01..000000000
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for klipper-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
index ec5672f01..039265b1b 100644
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
@@ -30,6 +30,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/new.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selecticon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/opt/trinity/share/man/man1/kmenuedit.1
 
 debian/icons/kmenuedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmenuedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
index c36dd0445..f9d56b353 100644
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,2 @@
 kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
 kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
-kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
-kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages
deleted file mode 100644
index e657bdffb..000000000
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmenuedit-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst
deleted file mode 100644
index b3a79cc14..000000000
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kmenuedit-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
index c023d564b..e00f630aa 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
index d073e179d..ab879281f 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
@@ -143,11 +143,11 @@ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/text-xslt-print.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/bluemorning.png
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/canvas.png
-debian/tmp/opt/trinity/share/apps/konqueror/tiles/kde4ever.png
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/kenwimer.png
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/noise.png
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/paper_flieder.png
 debian/tmp/opt/trinity/share/apps/konqueror/tiles/redfiber.png
+debian/tmp/opt/trinity/share/apps/konqueror/tiles/trinity4ever.png
 debian/tmp/opt/trinity/share/autostart/konqy_preload.desktop
 debian/tmp/opt/trinity/share/config.kcfg/keditbookmarks.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/konq_listview.kcfg
@@ -192,6 +192,9 @@ debian/tmp/opt/trinity/share/services/konq_sidebartng.desktop
 debian/tmp/opt/trinity/share/services/konq_textview.desktop
 debian/tmp/opt/trinity/share/services/konq_treeview.desktop
 debian/tmp/opt/trinity/share/servicetypes/konqaboutpage.desktop
+debian/tmp/opt/trinity/share/man/man1/keditbookmarks.1
+debian/tmp/opt/trinity/share/man/man1/kfmclient.1
+debian/tmp/opt/trinity/share/man/man1/konqueror.1
 
 debian/icons/keditbookmarks.xpm		/opt/trinity/share/pixmaps
 debian/icons/keditbookmarks-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages
deleted file mode 100644
index 8097ed067..000000000
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/konqueror-trinity.1
-debian/man/kfmclient-trinity.1
-debian/man/keditbookmarks-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
index 4c62f6bf2..a68978a50 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
@@ -26,7 +26,7 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
 
         update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
-          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
+          --slave /usr/share/man/man1/x-www-browser.1 x-www-browser.1 /opt/trinity/share/man/man1/konqueror.1
     ;;
 
     install)
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
index ee966a5c1..c02af16b0 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
@@ -58,6 +58,8 @@ debian/tmp/opt/trinity/share/apps/konsole/su.desktop
 debian/tmp/opt/trinity/share/apps/konsole/sumc.desktop
 debian/tmp/opt/trinity/share/apps/konsole/syscolor.schema
 debian/tmp/opt/trinity/share/apps/konsole/tips
+debian/tmp/opt/trinity/share/apps/konsole/Solarized.schema
+debian/tmp/opt/trinity/share/apps/konsole/SolarizedLight.schema
 debian/tmp/opt/trinity/share/apps/konsole/Transparent_darkbg.schema
 debian/tmp/opt/trinity/share/apps/konsole/Transparent_lightbg.schema
 debian/tmp/opt/trinity/share/apps/konsole/Transparent_MC.schema
@@ -82,6 +84,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/konsole.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/tabbar.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/konsole.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/konsole.svgz
+debian/tmp/opt/trinity/share/man/man1/konsole.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-konsole.desktop
 debian/tmp/opt/trinity/share/services/kded/kwrited.desktop
 debian/tmp/opt/trinity/share/services/konsolepart.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
index 7006dfe10..f0a12e1aa 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1 @@
 konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages b/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages
deleted file mode 100644
index 8c33f637e..000000000
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/konsole-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
index d8be0590f..3b7be1e92 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -20,10 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
-
-        # force ldconfig due to tdeinit library
-        ldconfig
+          --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/_base/core/tdebase/debian/kpager-trinity.install b/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
index 8e7ee184a..17d32c189 100644
--- a/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/settings.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kpager.png
+debian/tmp/opt/trinity/share/man/man1/kpager.1
 
 debian/icons/kpager.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpager-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages
deleted file mode 100644
index b34d67959..000000000
--- a/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpager-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
index 1b0039191..749090dab 100644
--- a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step3.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step4.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/kpersonalizer.png
+debian/tmp/opt/trinity/share/man/man1/kpersonalizer.1
 
 debian/icons/kpersonalizer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpersonalizer-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
deleted file mode 100644
index bcd309b73..000000000
--- a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpersonalizer-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
index fbbd61ab4..de0b2623f 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
@@ -7,3 +7,4 @@ debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdown.png
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
+debian/tmp/opt/trinity/share/man/man1/starttde.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
index 2c7c61596..74b77ecf6 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1 @@
 ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
-ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages
deleted file mode 100644
index 354e23800..000000000
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/starttde-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 7983daa09..3b85196bb 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -21,11 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /usr/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
-
-        # force ldconfig due to tdeinit library
-        ldconfig
+	--slave /usr/share/man/man1/x-session-manager.1 \
+	x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity-dev.install b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity-dev.install
index 499963483..31885eee1 100644
--- a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity-dev.install
+++ b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity-dev.install
@@ -1,23 +1,26 @@
-debian/tmp/opt/trinity/include//tdefileivi.h
-debian/tmp/opt/trinity/include//kivdirectoryoverlay.h
-debian/tmp/opt/trinity/include//knewmenu.h
-debian/tmp/opt/trinity/include//konqbookmarkmanager.h
-debian/tmp/opt/trinity/include//konq_defaults.h
-debian/tmp/opt/trinity/include//konq_dirpart.h
-debian/tmp/opt/trinity/include//konq_drag.h
-debian/tmp/opt/trinity/include//konq_events.h
-debian/tmp/opt/trinity/include//konq_faviconmgr.h
-debian/tmp/opt/trinity/include//konq_filetip.h
-debian/tmp/opt/trinity/include//konq_historycomm.h
-debian/tmp/opt/trinity/include//konq_historymgr.h
-debian/tmp/opt/trinity/include//konq_iconviewwidget.h
-debian/tmp/opt/trinity/include//konq_operations.h
-debian/tmp/opt/trinity/include//konq_pixmapprovider.h
-debian/tmp/opt/trinity/include//konq_popupmenu.h
-debian/tmp/opt/trinity/include//konq_propsview.h
-debian/tmp/opt/trinity/include//konq_settings.h
-debian/tmp/opt/trinity/include//konq_undo.h
-debian/tmp/opt/trinity/include//konq_xmlguiclient.h
-debian/tmp/opt/trinity/include//libkonq_export.h
+debian/tmp/opt/trinity/include/kivdirectoryoverlay.h
+debian/tmp/opt/trinity/include/kivfreespaceoverlay.h
+debian/tmp/opt/trinity/include/knewmenu.h
+debian/tmp/opt/trinity/include/konqbookmarkmanager.h
+debian/tmp/opt/trinity/include/konq_defaults.h
+debian/tmp/opt/trinity/include/konq_dirpart.h
+debian/tmp/opt/trinity/include/konq_drag.h
+debian/tmp/opt/trinity/include/konq_events.h
+debian/tmp/opt/trinity/include/konq_faviconmgr.h
+debian/tmp/opt/trinity/include/konq_filetip.h
+debian/tmp/opt/trinity/include/konq_historycomm.h
+debian/tmp/opt/trinity/include/konq_historymgr.h
+debian/tmp/opt/trinity/include/konq_iconviewwidget.h
+debian/tmp/opt/trinity/include/konq_operations.h
+debian/tmp/opt/trinity/include/konq_pixmapprovider.h
+debian/tmp/opt/trinity/include/konq_popupmenu.h
+debian/tmp/opt/trinity/include/konq_propsview.h
+debian/tmp/opt/trinity/include/konq_settings.h
+debian/tmp/opt/trinity/include/konq_sort_constants.h
+debian/tmp/opt/trinity/include/konq_string_compare.h
+debian/tmp/opt/trinity/include/konq_undo.h
+debian/tmp/opt/trinity/include/konq_xmlguiclient.h
+debian/tmp/opt/trinity/include/libkonq_export.h
+debian/tmp/opt/trinity/include/tdefileivi.h
 debian/tmp/opt/trinity/lib/libkonq.la
 debian/tmp/opt/trinity/lib/libkonq.so
diff --git a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
index c023d564b..e00f630aa 100644
--- a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
+++ b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1
deleted file mode 100644
index 3ab13208f..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
-.SH NAME
-appletproxy
-\- TDE kicker panel applet proxy
-.SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The applet's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the applet container
-.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 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 
-.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
-.SH FILES
-\fI/usr/share/apps/kicker/applets\fP
-kicker applets directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBextensionproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.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/tdebase/debian/man/drkonqi-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1
deleted file mode 100644
index 987164834..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
-.SH NAME
-drkonqi
-\- TDE crash handler gives the user feedback if a program crashed
-.SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The TDE crash handler gives the user feedback if a program crashed.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-signal  <number>
-The signal number that was caught
-.TP
-.B  \-\-appname  <name>
-Name of the program
-.TP
-.B  \-\-apppath  <path>
-Path to the executable
-.TP
-.B  \-\-appversion  <version>
-The version of the program
-.TP
-.B  \-\-bugaddress  <address>
-The bug address to use
-.TP
-.B  \-\-programname  <name>
-Translated name of the program
-.TP
-.B  \-\-pid  <pid>
-The PID of the program
-.TP
-.B  \-\-startupid  <id>
-Startup ID of the program
-.TP
-.B  \-\-tdeinit  
-The program was started by tdeinit
-.TP
-.B  \-\-safer  
-Disable arbitrary disk access
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Hans Petter Bieker <bieker@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/extensionproxy-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1
deleted file mode 100644
index 4ea041189..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
-.SH NAME
-extensionproxy
-\- TDE kicker panel extension proxy
-.SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The extension's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the extension container
-.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 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 
-.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
-.SH FILES
-\fI/usr/share/apps/kicker/extensions\fP
-kicker extensions directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBappletproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.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/tdebase/debian/man/gentdmconf-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.1
deleted file mode 100644
index d98e166c2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
-.SH NAME
-gentdmconf
-\- generate configuration files for tdm
-.SH SYNOPSIS
-\fBgentdmconf\fP
-.RB [ \-\-in
-.IR /path/to/new/tdm\-config\-dir ]
-.RS 11
-.RB [ \-\-old\-xdm
-.IR /path/to/old/xdm\-dir ]
-.br
-.RB [ \-\-old\-kde
-.IR /path/to/old/kde\-config\-dir ]
-.br
-.RB [ \-\-no\-old ]
-.RB [ \-\-no\-old\-xdm ]
-.RB [ \-\-no\-old\-kde ]
-.RB [ \-\-old\-scripts ]
-.br
-.RB [ \-\-no\-old\-scripts ]
-.RB [ \-\-old\-confs ]
-.RB [ \-\-no\-backup ]
-.br
-.RB [ \-\-no\-in\-notice ]
-.RE
-
-.SH DESCRIPTION
-\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
-.br
-If an older xdm/tdm configuration is found, its config files are "absorbed";
-if it lives in the new target directory, its scripts are reused (and possibly
-modified) as well, otherwise the scripts are ignored and default scripts are
-installed.
-.SH OPTIONS
-.TP
-.BI \-\-in \ /path/to/new/tdm\-config\-dir
-In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
-.br
-Default is \fI/etc/trinity/tdm\fP.
-.TP
-.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
-Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
-.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
-there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
-.br
-Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
-.TP
-.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
-Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
-.br
-.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
-.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
-.TP
-.B \-\-no\-old
-Don't look at older xdm/tdm configurations, just create default config.
-.TP
-.B \-\-no\-old\-xdm
-Don't look at older xdm configurations.
-.TP
-.B \-\-no\-old\-kde
-Don't look at older tdm configurations.
-.TP
-.B \-\-old\-scripts
-Directly use all scripts from the older xdm/tdm configuration.
-.TP
-.B \-\-no\-old\-scripts
-Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
-.TP
-.B \-\-old\-confs
-Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
-.TP
-.B \-\-no\-backup
-Overwrite/delete old config files instead of backing them up.
-.TP
-.B \-\-no\-in\-notice
-Don't put the notice about \fB\-\-in\fP being used into the generated README.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/kappfinder-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.1
deleted file mode 100644
index ec8eae964..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KAPPFINDER 1 "August, 24 2003"
-.SH NAME
-kappfinder \- searches for program to add to the Kde menu
-.SH SYNOPSIS
-.B kappfinder
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kappfinder
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kappfinder was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1
deleted file mode 100644
index 7d57958d2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
-.SH NAME
-kasbar
-\- An alternative task manager
-.SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-test  
-Test the basic kasbar code
-.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 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 
-.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 
-
-.SH SEE ALSO
-\fBkicker\fP(1)
-.SH AUTHORS
-.nf
-
-.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/tdebase/debian/man/kate-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kate-trinity.1
deleted file mode 100644
index e48268d6f..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kate-trinity.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH KATE 1 "May 2006"
-.SH NAME
-kate \- TDE Advanced Text Editor
-.SH SYNOPSIS
-.B kate
-.RI [ options ] [file(s)]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kate
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
-
-It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
-
-Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
-
-It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-s, \-\-start <name>
-Start Kate with a given session
-.TP
-.B \-u, \-\-use
-Use a already running kate instance (if possible)
-.TP
-.B \-p, \-\-pid <pid>
-Only try to reuse kate instance with this pid
-.TP
-.B \-e, \-\-encoding <name>
-Set encoding for the file to open
-.TP
-.B \-l, \-\-line <line>
-Navigate to this line
-.TP
-.B \-c, \-\-column <column>
-Navigate to this column
-.TP
-.B \-i, \-\-stdin
-Read the contents of stdin
-.TP
-.B file(s)
-is the file or the files to open
-
-.SH SEE ALSO
-.BR kwrite (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
-.PP
-kate was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
deleted file mode 100644
index 46b2d4e1a..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-kblankscrn.kss
-\- TDE screensaver which shows a blank screen
-.SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKBlankScreen\fP is a screensaver which shows a blank screen.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.TP
-.B  \-\-demo  
-Start screen saver in demo mode [default]
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-The KDE Project <www.kde.org>
-
-.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/tdebase/debian/man/kcheckpass-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.1
deleted file mode 100644
index fa5a4c817..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
-.SH NAME
-kcheckpass
-\- The KCheckPass authentication software
-.SH SYNOPSIS
-\fBkcheckpass\fP
-.SH DESCRIPTION
-\fBKCheckPass\fP is TDE's authentication program. It is meant to be
-used by any software in need of user authentication, most
-notably screensavers.
-.sp 1
-It enhances security be the following means:
-.br
-.IP "     \-"
-It's only a small program, which is hopefully simple enough to
-allow it to be SUID root. Setting it to SUID root is necessary
-on Shadow Password systems.
-.IP "     \-"
-No other program in need of user authentication, must be
-SUID root.
-.IP "     \-"
-It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
-.PP
-.br
-\fBTechnique:\fP
-.sp 1
-\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
-.sp 1
-If the password was accepted, the program exits with 0;
-.br
-if it was rejected, it exits with 1. Any other exit code signals an error.
-
-.SH AUTHORS
-.nf
-Olaf Kirch <okir@caldera.de>
-.br
-Christian Esken <esken@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-.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/tdebase/debian/man/kcminit-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1
deleted file mode 100644
index 4c557456e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
-.SH NAME
-kcminit
-\- runs startups initialization for Control Modules.
-.SH SYNOPSIS
-\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
-.SH DESCRIPTION
-\fBkcminit\fP runs startups initialization for Control Modules.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B module
-Configuration module to run
-.SS Options:
-.TP
-.B  \-\-list  
-List modules that are run at startup
-.SS 
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/kdcop-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1
deleted file mode 100644
index 1c01dcc47..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
-.SH NAME
-kdcop
-\- A graphical DCOP browser/client
-.SH SYNOPSIS
-\fBkdcop\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
-their interfaces, and the interfaces' arguments. You can even execute DCOP
-calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
-open a dialog and prompt you for them. If the method returns a return value,
-you will see it in a message box after the call.
-.SH OPTIONS
-.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 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 
-.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
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdcop/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdcop/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matthias Kalle Dalheimer <kalle@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Ian Reinhart Geiser <geiseri@kde.org>
-.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/tdebase/debian/man/kdialog-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1
deleted file mode 100644
index 243709ed1..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kdialog \- Show TDE dialog boxes from shell scripts
-.SH SYNOPSIS
-.B kdialog
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdialog
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B kdialog
-allows to display dialog boxes from shell scripts.
-The syntax is very much inspired from the 
-.B dialog
-command
-(which shows text mode dialogs).
-.SH OPTIONS
-.TP
-.BI \-\-yesno " text"
-Question message box with yes/no buttons
-.TP
-.BI \-\-yesnocancel " text"
-Question message box with yes/no/cancel buttons
-.TP
-.BI \-\-warningyesno " text"
-Warning message box with yes/no buttons
-.TP
-.BI \-\-warningcontinuecancel " text"
-Warning message box with continue/cancel buttons
-.TP
-.BI \-\-warningyesnocancel " text"
-Warning message box with yes/no/cancel buttons
-.TP
-.BI \-\-sorry " text"
-\&'Sorry' message box
-.TP
-.BI \-\-error " text"
-\&'Error' message box
-.TP
-.BI \-\-msgbox " text"
-Message Box dialog
-.TP
-.BI \-\-inputbox " text init"
-Input Box dialog
-.TP
-.BI \-\-password " text"
-Password dialog
-.TP
-.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
-Text Box dialog
-.TP
-.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
-Menu dialog
-.TP
-.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
-Check List dialog
-.TP
-.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
-Radio List dialog
-.TP
-.BI \-\-title " text"
-Dialog title
-.TP
-.B \-\-separate\-output
-Return list items on separate lines (for checklist option)
-.SS "Arguments:"
-.TP
-arg
-Arguments - depending on main option
-.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
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-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
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KDialog was written by
-.nh
-.ad l
-David Faure <faure@kde.org>,
-Nick Thompson,
-Nick Thompson,
-Matthias Hoelzer <hoelzer@kde.org> and
-David Gumbel <david.guembel@gmx.net>.
-.br
-.hy
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
deleted file mode 100644
index 23606dccb..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
-.SH NAME
-keditbookmarks
-- Konqueror Bookmark Editor
-.SH SYNOPSIS
-keditbookmarks [Qt-options] [TDE-options] [options] [file] 
-.SH DESCRIPTION
-Bookmark editor for TDE.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to edit
-.SS Options:
-.TP
-.B  --importmoz  <filename>
-Import bookmarks from a file in Mozilla format
-.TP
-.B  --importns  <filename>
-Import bookmarks from a file in Netscape (4.x and earlier) format
-.TP
-.B  --importie  <filename>
-Import bookmarks from a file in Internet Explorer's Favorites format
-.TP
-.B  --importopera  <filename>
-Import bookmarks from a file in Opera format
-.TP
-.B  --exportmoz  <filename>
-Export bookmarks to a file in Mozilla format
-.TP
-.B  --exportns  <filename>
-Export bookmarks to a file in Netscape (4.x and earlier) format
-.TP
-.B  --exporthtml  <filename>
-Export bookmarks to a file in a printable HTML format
-.TP
-.B  --exportie  <filename>
-Export bookmarks to a file in Internet Explorer's Favorites format
-.TP
-.B  --exportopera  <filename>
-Export bookmarks to a file in Opera format
-.TP
-.B  --address  <address>
-Open at the given position in the bookmarks file
-.TP
-.B  --customcaption  <caption>
-Set the user readable caption for example "Konsole"
-.TP
-.B  --nobrowser  
-Hide all browser related functions
-.SS 
-.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
-.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 AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Alexander Kellett <lypanov@kde.org>
-.br
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1
deleted file mode 100644
index 55542fd66..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH KFIND 1 "August, 25 2003"
-.SH NAME
-kfind \- TDE find tool
-.SH SYNOPSIS
-.B kfind
-.RI [ options ]  [searchpath]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfind
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
-
-It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.TP
-.B searchpath
-is the path in which the search must be done
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kfind was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1
deleted file mode 100644
index 67cbed380..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
-.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
-.SH NAME
-kfmclient
-- TDE tool for opening URLs from the command line
-.SH SYNOPSIS
-kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
-.SH DESCRIPTION
-kfmclient is a tool for opening local and remote URLs in Konqueror from
-the command line.
-.SH COMMANDS
-.SS
-.SS openURL
-.TP
-kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
-Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
-such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
-
-If \fImimetype\fR is specified, it will be used to determine the component
-that Konqueror should use. For instance, set it to text/html for a web
-page, to make it appear faster.
-.SS newTab
-.TP
-kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
-Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
-window on the current active desktop if possible.
-.SS openProfile
-.TP
-kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
-Opens a window using the given profile. \fIprofile\fR is a file under
-~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
-.SS openProperties
-.TP
-kfmclient openProperties \fIurl\fR
-Opens a properties menu.
-.SS exec
-.TP
-kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
-Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
-be opened. You may omit \fIbinding\fR. In this case the default binding
-is tried. Of course URL may be the URL of a document, or it may be a
-*.desktop file.
-This way you could for example mount a device by passing 'Mount default'
-as binding to 'cdrom.desktop'.
-.SS move
-.TP
-kfmclient move \fIsrc\fR \fIdest\fR
-Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS copy
-.TP
-kfmclient copy \fIsrc\fR \fIdest\fR
-Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS download
-.TP
-kfmclient download [ \fIsrc\fR ]
-Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
-a list of URLs, if not present then a URL will be requested.
-.SS sortDesktop
-.TP
-kfmclient sortDesktop
-Rearranges all icons on the desktop.
-.SS configure
-.TP
-kfmclient configure
-Re-read Konqueror's configuration.
-.SS configureDesktop
-.TP
-kfmclient configureDesktop
-Re-read kdesktop's configuration.
-.SH OPTIONS
-.SS
-.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
-.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
-.SH EXAMPLES
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
-Mounts the CD-ROM.
-.TP
-kfmclient exec file:/home/weis/data/test.html
-Opens the file with default binding.
-.TP
-kfmclient exec file:/home/weis/data/test.html Netscape
-Opens the file with netscape.
-.TP
-kfmclient exec ftp://localhost/
-Opens new window with URL.
-.TP
-kfmclient exec file:/root/Desktop/emacs.desktop
-Starts emacs.
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop
-Opens the CD-ROM's mount directory.
-.TP
-kfmclient exec .
-Opens the current directory. Very convenient.
-.SH OTHER
-This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
-Debian system (but may be used by others).
-
-This manual page can be redistribute and/or modified it under the terms
-of the GNU General Public License as published by the Free Software
-Foundation; version 2 dated June, 1991.
-.nf
diff --git a/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1
deleted file mode 100644
index 34d754b05..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
-.SH NAME
-khotkeys
-\- daemon to bind actions to triggers and conditions
-.SH SYNOPSIS
-\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
-.SH OPTIONS
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/khotkeysrc
-\fBkhotkeys\fP configuration file
-
-.SH AUTHORS
-.nf
-Lubos Lunak <l.lunak@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/kicker-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1
deleted file mode 100644
index 1d17fa199..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
-.SH NAME
-kicker
-\- The TDE panel
-.SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
-.SH OPTIONS
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-\fBkasbar\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kicker/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kicker/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Aaron J. Seigo <aseigo@kde.org>
-.br
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-Wilco Greven <greven@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Daniel M. Duley <mosfet@kde.org>
-.br
-Preston Brown <pbrown@kde.org>
-.br
-John Firebaugh <jfirebaugh@kde.org>
-.br
-Waldo Bastian <bastian@kde.org>
-.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/tdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1
deleted file mode 100644
index 6dae2692e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
-.SH NAME
-kjobviewer
-\- a print job viewer
-.SH SYNOPSIS
-\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
-.sp 1
-The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
-.sp 1
-With kjobviewer you can...
-.IP "     \-"
-see an overview for a certain queue or see all jobs on all queues;
-.IP "     \-"
-filter the list to see your "own" jobs only;
-.IP "     \-"
-sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
-.IP "     \-"
-stop a job from printing, putting it into a "held" state;
-.IP "     \-"
-re\-start a held job;
-.IP "     \-"
-manually release a job that was sent to "hold" from the client already;
-.IP "     \-"
-reschedule a job for printing at a specified time;
-.IP "     \-"
-increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
-.IP "     \-"
-move a job to a different print\-queue;
-.IP "     \-"
-stop jobs from leaving the queue (while still accepting incoming ones);
-.IP "     \-"
-reject new incoming jobs (while still printing all the pending ones until the queue is empty);
-.IP "     \-"
-check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
-.IP "     \-"
-view the existing and re\-assign a new job\-billing tag to a job;
-.IP "     \-"
-pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
-.IP "     \-"
-increase or decrease the number of required copies;
-.IP "     \-"
-cancel and delete a no-longer\-required job.
-.PP
-Note, that some of these manipulations require job ownership or root access.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-d  
-<printer\-name>         The printer for which jobs are requested
-.TP
-.B  \-\-noshow  
-Show job viewer at startup
-.TP
-.B  \-\-all  
-Show jobs for all printers
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kjobviewer/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kjobviewer/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/kmenuedit-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.1
deleted file mode 100644
index fd5c7daf5..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH KMENUEDIT 1 "August, 24 2003"
-.SH NAME
-kmenuedit \- editor for the TDE menu
-.SH SYNOPSIS
-.B kmenuedit
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmenuedit
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmenuedit was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1
deleted file mode 100644
index 84bc38fcf..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
-.SH NAME
-knetattach
-\- TDE Network Wizard
-.SH SYNOPSIS
-\fBknetattach\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
-.sp 1
-The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
-.sp 1
-The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
-.br
-.RS 3
-\- WebDav
-.br
-\- FTP
-.br
-\- Microsoft(R) Windows(R) (Samba) network drives
-.br
-\- SSH
-.RE
-.SH OPTIONS
-.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 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 
-.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
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/knetattach/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/knetattach/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-George Staikos <staikos@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/konqueror-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1
deleted file mode 100644
index 0515c4f87..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
-.SH NAME
-konqueror
-- Web browser, file manager, ...
-.SH SYNOPSIS
-konqueror [Qt-options] [TDE-options] [options] [URL] 
-.SH DESCRIPTION
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view
-documents without ever launching another application.
-
-This package is part of the official TDE base module.
-
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Location to open
-.SS Options:
-.TP
-.B  --silent  
-Start without a default window
-.TP
-.B  --preload  
-Preload for later use
-.TP
-.B  --profile  <profile>
-Profile to open
-.TP
-.B  --profiles  
-List available profiles
-.TP
-.B  --mimetype  <mimetype>
-Mimetype to use for this URL (e.g. text/html or inode/directory)
-.TP
-.B  --select  
-For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
-.SS 
-.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
-.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:/konqueror/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konqueror/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Simon Hausmann <hausmann@kde.org>
-.br
-Michael Reiher <michael.reiher@gmx.de>
-.br
-Matthias Welk <welk@fokus.gmd.de>
-.br
-Alexander Neundorf <neundorf@kde.org>
-.br
-Michael Brade <brade@kde.org>
-.br
-Lars Knoll <knoll@kde.org>
-.br
-Dirk Mueller <mueller@kde.org>
-.br
-Peter Kelly <pmk@post.com>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-Germain Garand <germain@ebooksfrance.org>
-.br
-Leo Savernik <l.savernik@aon.at>
-.br
-Stephan Kulow <coolo@kde.org>
-.br
-Antti Koivisto <koivisto@kde.org>
-.br
-Apple Safari Developers
-.br
-Harri Porten <porten@kde.org>
-.br
-Koos Vriezen <koos.vriezen@xs4all.nl>
-.br
-Matt Koss <koss@miesto.sk>
-.br
-Alex Zepeda <zipzippy@sonic.net>
-.br
-Richard Moore <rich@kde.org>
-.br
-Dima Rogozin <dima@mercury.co.il>
-.br
-Wynn Wilkes <wynnw@calderasystems.com>
-.br
-Stefan Schimanski <schimmi@kde.org>
-.br
-George Staikos <staikos@kde.org>
-.br
-Dawit Alemayehu <adawit@kde.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-Torsten Rahn <torsten@kde.org>
-.br
-Torben Weis <weis@kde.org>
-.br
-Joseph Wenninger <jowenn@kde.org>
-.br
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1
deleted file mode 100644
index 5de5500b4..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" The draft of this file was generated by kdemangen.pl and edited after.
-.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-.BR Konsole
-\- X terminal emulator for TDE.
-.SH SYNOPSIS
-.BR Konsole 
-[Qt\-options] [TDE\-options] [options] [args] 
-.SH DESCRIPTION
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-.PP
-Konsole advanced features include simple configuration and the ability to use
-multiple terminal shells in a single window, making for a less
-cluttered desktop.
-.PP
-Using Konsole, a user can open:
-.PP
-.RS
-Linux console sessions
-.PP
-Shell sessions
-.PP
-Screen sessions
-.PP
-Midnight Commander file manager sessions
-.PP
-Root console sessions
-.PP
-Root Midnight Commander sessions
-.PP
-User created sessions
-.RE
-
-These sessions can be renamed to help you keep track of all your shells,
-or signaled (STOP, CONT, HUP, INT, TERM, KILL).
-.PP
-For more control over konsole, a user can:
-hide/show the menubar and/or frame;
-select the size of a konsole window, fonts, color
-schemes, and key mapping;
-change location of the scrollbar or hide the scrollbar;
-change location of the tabbar or hide the tabbar.
-.PP
-All chosen settings can be made the default for forthcoming sessions by
-saving them.
-.SH OPTIONS
-.SS
-.SS Konsole specific options:
-.TP
-.B  \-\-name  <name>
-Set window class
-.TP
-.B  \-\-ls  
-Start login shell
-.B \-T <title>                
-Set the window title
-.TP
-.B  \-\-tn  <terminal>
-Specify terminal type as set in the TERM [xterm]
-environment variable
-.TP
-.B  \-\-noclose  
-Do not close Konsole when command exits
-.TP
-.B  \-\-nohist  
-Do not save lines in history
-.TP
-.B  \-\-nomenubar  
-Do not display menubar
-.TP
-.B \-\-notabbar,  \-\-notoolbar  
-Do not display tab bar
-.TP
-.B  \-\-noframe  
-Do not display frame
-.TP
-.B  \-\-noscrollbar  
-Do not display scrollbar
-.TP
-.B  \-\-noxft  
-Do not use Xft (anti-aliasing)
-.TP
-.B  \-\-vt_sz CCxLL             
-Terminal size in columns x lines
-.TP
-.B  \-\-noresize  
-Terminal size is fixed
-.TP
-.B  \-\-type  <type>
-Start with given session type
-.TP
-.B  \-\-types  
-List available session types
-.TP
-.B  \-\-keytab  <name>
-Set keytab to 'name'
-.TP
-.B  \-\-keytabs  
-List available keytabs
-.TP
-.B  \-\-profile  <name>
-Start with given session profile
-.TP
-.B  \-\-profiles  
-List available session profiles
-.TP
-.B  \-\-schema  <name>
-| <file>  Set schema to 'name' or use 'file'
-.TP
-.B \-\-schemas,  \-\-schemata  
-List available schemata
-.TP
-.B  \-\-script  
-Enable extended DCOP Qt functions
-.TP
-.B  \-\-workdir  <dir>
-Change working directory to 'dir'
-.TP
-.B \-e <command> [ arguments ]
-Execute 'command' instead of shell. It also sets the window title and 
-icon name to be the basename of the program being executed if neither 
--T nor -n are given on the command line. 
-This must be the last option on the command line.
-.SS 
-.SS Arguments:
-.TP
-.B args
-Arguments for 'command'
-.SS
-.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 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konsole/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konsole/'"
-from the command-line.
-.BR
-
-Konsole homepage: 
-.BR http://konsole.kde.org/
-.SH AUTHORS
-Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
-
-Lars Doelle <lars.doelle@on-line.de>
-.BR
-.SH OTHER
-This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
-system (but may be used by others).
-.BR
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1
deleted file mode 100644
index 63a24f267..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH KPAGER 1 "August, 24 2003"
-.SH NAME
-kpager \- Trinity desktop pager
-.SH SYNOPSIS
-.B kpager
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kpager
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-hidden
-Create the preview of the desktops, but hide the window
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kpager was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
deleted file mode 100644
index 01dc0b3cc..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KPERSONALIZER 1
-.SH NAME
-kpersonalizer - TDE basic settings wizard
-
-.SH SYNOPSIS
-
-.B kpersonalizer [OPTION...]
-
-.SH DESCRIPTION
-
-The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
-.PP
-KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
-
-.SH OPTIONS
-
-KPersonalizer accepts the following options:
-.PP
-.B Help 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. 
-
-.PP
-.B Options
-.TP
-.B \-r 
-KPersonalizer is restarted by itself. 
-.TP
-.B \-\-before-session 
-KPersonalizer is started before the TDE session.
-
-.SH EXAMPLES
-.TP
-.B kpersonalizer
-Run kpersonalizer to set (or reset) TDE preferences.
-.TP
-.B kpersonalizer --before-session
-Run kpersonalizer before the first TDE session. 
-
-.SH AUTHORS
-
-Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
-.PP
-This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
-.SH "SEE ALSO"
-.TP
-.BR khelpcenter (1)
diff --git a/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1
deleted file mode 100644
index a3ecdc88b..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
-.SH NAME
-kprinter
-\- a printer tool for TDE
-.SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
-.SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
-.sp 1
-\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
-.sp 1
-With \fBKPrinter\fP you can...
-.IP "     \-"
-switch "on the fly" the print subsystem\-to\-use,
-.IP "     \-"
-start the Add Printer Wizard,
-.IP "     \-"
-choose the target printer,
-.IP "     \-"
-possibly select one or more files to print,
-.IP "     \-"
-drag'n'drop files for print,
-.IP "     \-"
-check for or set the print options,
-.IP "     \-"
-schedule the job for later printing,
-.IP "     \-"
-tag the print job with accounting information for billing purposes,
-.IP "     \-"
-set the job priority for a higher or lower level to influence the order of the job queue,
-.IP "     \-"
-access the TDEPrint configurator,
-.IP "     \-"
-and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
-.SP
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   Files to load
-.SS Options:
-.TP
-.B  \-c  
-Make an internal copy of the files to print
-.TP
-.B \-P,  \-d  <printer>
-Printer/destination to print on
-.TP
-.B \-J,  \-t  <title>
-Title/Name for the print job
-.TP
-.B \-#, \-n <number>
-Number of copies
-.TP
-.B  \-o  
-<option=value>         Printer option
-.TP
-.B  \-j  <mode>
-Job output mode (gui, console, none) [gui]
-.TP
-.B  \-\-system  <printsys>
-Print system to use (lpd, cups)
-.TP
-.B  \-\-stdin  
-Allow printing from STDIN
-.TP
-.B  \-\-nodialog  
-Do not show the print dialog (print directly)
-.SS 
-.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 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
-\fB\-\-nograb\fP, use \fB\-\-dograb\fP 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 
-.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 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kprinter/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kprinter/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/krandom.kss-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1
deleted file mode 100644
index 4a13d95ec..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-krandom.kss
-\- Start a random TDE screen saver
-.SH SYNOPSIS
-\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkrandom.kss\fP starts a random TDE screen saver.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-
-.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/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1
deleted file mode 100644
index 3bb6c4d0b..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
-.SH NAME
-kreadconfig
-\- Read TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
-read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-default  <default>
-Default value
-.TP
-.B  \-\-type  <type>
-Type of variable
-.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 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 
-.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
-
-.SH FILES
-.I /etc/trinity/system.kdeglobals
-global TDE configuration file
-.I ~/.trinity/share/config
-standard configuration directory
-
-.SH AUTHORS
-.nf
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/krootimage-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1
deleted file mode 100644
index e9b19a604..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-krootimage
-\- set desktop background for tdm
-.SH SYNOPSIS
-\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
-.SH DESCRIPTION
-\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B config
-Name of the configuration file
-.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 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 
-.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 
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.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/tdebase/debian/man/kstart-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1
deleted file mode 100644
index 9d3a77ddc..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1
+++ /dev/null
@@ -1,215 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
-.SH NAME
-kstart
-\- Utility to launch applications with special window properties 
-.SH SYNOPSIS
-\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-Utility to launch applications with special window properties.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-.TP
-.B  \-\-windowclass  <class>
-A string matching the window class (WM_CLASS property)
-The window class can be found out by running
-'xprop | grep WM_CLASS' and clicking on a window
-(use either both parts separated by a space or only the right part).
-NOTE: If you specify neither window title nor window class,
-then the very first window to appear will be taken;
-omitting both options is NOT recommended.
-.TP
-.B  \-\-desktop  <number>
-Desktop on which to make the window appear
-.TP
-.B  \-\-currentdesktop  
-Make the window appear on the desktop that was active
-when starting the application
-.TP
-.B  \-\-alldesktops  
-Make the window appear on all desktops
-.TP
-.B  \-\-iconify  
-Iconify the window
-.TP
-.B  \-\-maximize  
-Maximize the window
-.TP
-.B  \-\-maximize\-vertically  
-Maximize the window vertically
-.TP
-.B  \-\-maximize\-horizontally  
-Maximize the window horizontally
-.TP
-.B  \-\-fullscreen  
-Show window fullscreen
-.TP
-.B  \-\-type  <type>
-The window type: Normal, Desktop, Dock, Tool, 
-Menu, Dialog, TopMenu or Override
-.TP
-.B  \-\-activate  
-Jump to the window even if it is started on a 
-different virtual desktop
-.TP
-.B \-\-ontop,  \-\-keepabove  
-Try to keep the window above other windows
-.TP
-.B \-\-onbottom,  \-\-keepbelow  
-Try to keep the window below other windows
-.TP
-.B  \-\-skiptaskbar  
-The window does not get an entry in the taskbar
-.TP
-.B  \-\-skippager  
-The window does not get an entry on the pager
-.TP
-.B  \-\-tosystray  
-The window is sent to the system tray in Kicker
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Matthias Ettrich <ettrich@kde.org>
-.br
-David Faure <faure@kde.org>
-.br
-Richard J. Moore <rich@kde.org>
-.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/tdebase/debian/man/ksystraycmd-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
deleted file mode 100644
index 4807276c0..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
+++ /dev/null
@@ -1,189 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
-.SH NAME
-ksystraycmd
-\- Allows any application to be kept in the system tray
-.SH SYNOPSIS
-\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-The system tray is an area in which an application can display a small window.
-It may be used to display status information or provide quick access to commands.
-Normally tray icons are developed as part of an application.
-\fBksystraycmd\fP allows any application to be kept in the system tray.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-If you do not specify one, then the very first window
-to appear will be taken \- not recommended.
-.TP
-.B  \-\-wid  <int>
-The window id of the target window
-Specifies the id of the window to use. If the id starts with 0x
-it is assumed to be in hex.
-.TP
-.B  \-\-hidden  
-Hide the window to the tray on startup
-.TP
-.B  \-\-startonshow  
-Wait until we are told to show the window before
-executing the command
-.TP
-.B  \-\-tooltip  <text>
-Sets the initial tooltip for the tray icon
-.TP
-.B  \-\-keeprunning  
-Keep the tray icon even if the client exits. This option
-has no effect unless startonshow is specified.
-.TP
-.B  \-\-ownicon  
-Use ksystraycmd's icon instead of window's icon in systray
-(should be used with \-\-icon to specify ksystraycmd icon)
-.TP
-.B  \-\-ontop  
-Try to keep the window above other windows
-.TP
-.B  \-\-quitonhide  
-Quit the client when we are told to hide the window.
-This has no effect unless startonshow is specified and implies keeprunning.
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Richard Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/ktrash-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1
deleted file mode 100644
index 0094c84fa..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-ktrash
-\- Helper program to handle the TDE trash can
-.SH SYNOPSIS
-\fBktrash\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-\fBktrash\fP is a helper program to handle the TDE trash can.
-.sp 1
-Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B  \-\-empty  
-Empty the contents of the trash
-.TP
-.B  \-\-restore  <file>
-Restore a trashed file to its original location
-.SS 
-.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 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 
-.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 
-.SH SEE ALSO
-\fBkfmclient\fP(1)
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/kwrite-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.1
deleted file mode 100644
index f7d39f61d..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH KWRITE 1 "August, 25 2003"
-.SH NAME
-kwrite \- TDE text editor
-.SH SYNOPSIS
-.B kwrite
-.RI [ options ]  [file]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kwrite
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
-It allows syntax coloration for many langages.
-
-It is able to expand or collapse parts of code (C functions, ...).
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.B file
-is the file to open
-
-.SH SEE ALSO
-.BR kate (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kwrite was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
deleted file mode 100644
index b347b9849..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
-.SH NAME
-kwriteconfig
-\- Write TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
-.SH DESCRIPTION
-\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
-Nonexisting files/groups/keys will be created.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
-writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B value
-The value to write. Mandatory, on a shell use '' for empty
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-type  <type>
-Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
-.SS 
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Luis Pedro Coelho <luis_pedro@netcabo.pt>
-.br
-Bernhard Rosenkraenzer <bero@redhat.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/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1
deleted file mode 100644
index 9a6a6bcf6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
-.SH NAME
-kxkb
-\- A utility to switch keyboard maps
-.SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
-.sp 1
-\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
-.sp 1
-When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
-.sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
-.SH OPTIONS
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kxkb/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kxkb/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andriy Rysin <rysin@kde.org>
-.br
-Shaheed Haque <srhaque@iee.org>
-.br
-Ilya Konstantinov <kde\-devel@future.galanet.net>
-.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/tdebase/debian/man/starttde-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/starttde-trinity.1
deleted file mode 100644
index 73ab27b9c..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/starttde-trinity.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH starttde 1 "Jan 17, 2005"
-.SH NAME
-starttde \- Starts up the Trinity Desktop Environment 
-.SH SYNOPSIS
-.B starttde
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B starttde
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-The \fBstarttde\fP script starts up the Trinity Desktop Environment and
-is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
-your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
-will load your last session, or a default session that includes the standard
-TDE programs if no saved session is available.
-
-\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
-any X11R6 SM compliant program.
-
-\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
-for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
-can be used to define environment variables that will be available to all TDE 
-programs.
-
-For anything else (that doesn't set env vars, or that needs a window manager),
-better use the ~/.trinity/Autostart folder.
-
-At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
-
-
-.SH OPTIONS
-\fBstarttde\fP takes no command line options.
-
-.SH AUTHOR
-\fBstarttde\fP is written by the KDE Project.
-
-This manual page was written by Philipp Grau.
-
-.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of starttde to the Bug
-Tracking System at: http://bugs.debian.org
-.SH COPYRIGHT
-Copyright \(co 2005 Philipp Grau.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
deleted file mode 100644
index af48f59e6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
-.SH NAME
-tdedebugdialog
-\- A dialog box for setting preferences for debug output
-.SH SYNOPSIS
-\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
-.sp 1
-If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
-.sp 1
-If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
-.sp 1
-In full mode, first you should select the debug area you are interested in from the drop down list at the top.
-.sp 1
-You may independently set the output for various types of messages:
-.sp 1
-.RS 3
-\- Information
-.br
-\- Warning
-.br
-\- Error
-.br
-\- Fatal Error
-.RE
-.PP
-For each of these types, you can set the following:
-.sp 1
-\fBOutput to\fP:
-.br
-In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
-.sp 1
-\fBFilename:\fP
-.br
-This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
-.sp 1
-When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-fullmode  
-Show the fully\-fledged dialog instead of the default list dialog
-.TP
-.B  \-\-on  <area>
-Turn area on
-.TP
-.B  \-\-off  <area>
-Turn area off
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/kdebugrc
-\fBtdedebugdialog\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdedebugdialog/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdedebugdialog/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
deleted file mode 100644
index 1e7b055f6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdeio_media_mounthelper
-\- tdeio_media_mounthelper
-.SH SYNOPSIS
-\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
-.SH DESCRIPTION
-\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-media:/ URL to mount/unmount/eject/remove
-.SS Options:
-.TP
-.B  \-u  
-Unmount given URL
-.TP
-.B  \-m  
-Mount given URL (default)
-.TP
-.B  \-e  
-Eject given URL via tdeeject
-.TP
-.B  \-s  
-Unmount and Eject given URL (necessary for some USB devices)
-.SS 
-.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 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 
-.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 
-.SH AUTHORS
-.nf
-Waldo Bastian <bastian@kde.org>
-.br
-Kevin Ottens <ervin@ipsquad.net>
-
-.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/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/tdepasswd-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1
deleted file mode 100644
index e09aff0e2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH TDEPASSWD 1
-
-.SH NAME
-tdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.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
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B TDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
deleted file mode 100644
index e407c294e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
-.SH NAME
-tdeprintfax
-\- a interface to fax-packages
-.SH SYNOPSIS
-\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
-.SH DESCRIPTION
-\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to fax (added to the file list)
-.SS Options:
-.TP
-.B  \-\-phone  
-Phone number to fax to
-.TP
-.B  \-\-immediate  
-Send fax immediately
-.TP
-.B  \-\-batch  
-Exit after sending
-.SS 
-.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 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 
-.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 
-
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/tdesu-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1
deleted file mode 100644
index fa8c45e09..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
-.SH NAME
-tdesu \- Runs a program with elevated privileges.
-.SH SYNOPSIS
-\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
-.SH DESCRIPTION
-Runs a program with elevated privileges.
-.PP
-TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
-.PP
-\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
-.PP
-\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
-.SH OPTIONS
-.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
-.SS
-.SS tdesu Options:
-.TP
-.TP
-.B -c <command>
-Specifies the command to run
-.TP
-.B -f <file>
-Run command under target uid if <file> is not writable
-.TP
-.B -u <user>
-Specifies the target uid [default is root]
-.TP
-.B -n
-Do not keep password
-.TP
-.B -s
-Stop the daemon (forgets all passwords)
-.TP
-.B -t
-Enable terminal output (no password keeping)
-.TP
-.B -p <prio>
-Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
-.TP
-.B -r
-Use realtime scheduling
-.TP
-.B  --nonewdcop
-Let command use existing dcopserver
-.TP
-.B -i <icon name>
-Specify icon to use in the password dialog
-.TP
-.B -d
-Do not show the command to be run in the dialog
-.SS 
-.SS Arguments:
-.TP
-.B command
-Specifies the command to run
-
-.SH CONFIGURATION FILES
-.PP
-\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
-.SH EXAMPLE
-The configuration item for the configuration files is the following:
-.br
-[super-user-command] 
-.br
-super-user-command=sudo
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdesu/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdesu/'"
-from the command-line.
-.br
-.SH AUTHORS
-.br
-Geert Jansen <jansen@kde.org>
-.br
-Pietro Iglio <iglio@fub.it>
-.PP
-This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1
deleted file mode 100644
index 1150fe5a8..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
-.SH NAME
-tdm
-\- Trinity Display Manager
-.SH SYNOPSIS
-\fBtdm\fP [options] [tty]
-.SH DESCRIPTION
-\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
-.br
-\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
-.sp 1
-\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
-.SH OPTIONS
-.TP
-.B \-daemon
-Daemonize even when started by init
-.TP
-.B \-nodaemon
-Don't daemonize even when started from command line
-.TP
-.BI \-config\  file
-Use alternative master configuration file
-.TP
-.BR \-xrm \ res
-Override frontend\-specific resource
-.TP
-.BI \-error\  file
-Use alternative log file
-.TP
-.BR \-debug \ num
-Debug option bitfield:
-.RS 11
-0x1   \- core log
-.br
-0x2   \- config reader log
-.br
-0x4   \- greeter log
-.br
-0x8   \- IPC log
-.br
-0x10  \- session sub-daemon post-fork delay
-.br
-0x20  \- config reader post-start delay
-.br
-0x40  \- greeter post-start delay
-.br
-0x80  \- don't use syslog
-.br
-0x100 \- core Xauth log
-.br
-0x400 \- valgrind config reader and greeter
-.br
-0x800 \- strace config reader and greeter
-.RE
-.SH FILES
-.TP
-.I /etc/trinity/tdm/backgroundrc
-configuration file with background settings
-.TP
-.I /etc/trinity/tdm/tdm.options
-options for X display manager tdm
-.TP
-.I /etc/trinity/tdm/tdmrc
-the tdm configuration file
-.TP
-.I /etc/trinity/tdm/Xaccess
-access control file for XDMCP connections
-.TP
-.I /etc/trinity/tdm/Xservers
-list of local X-servers
-.TP
-.I /etc/trinity/tdm/Xreset
-script to run as root after session exits
-.TP
-.I /etc/trinity/tdm/Xsession
-script to run as user after login of user
-.TP
-.I /etc/trinity/tdm/Xsetup
-script to run as root before the login dialog appears
-.sp 1
-this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
-.TP
-.I /etc/trinity/tdm/Xstartup
-script to run as root before session starts
-.TP
-.I /etc/trinity/tdm/Xwilling
-output of this script is displayed in the chooser window
-.SH SEE ALSO
-.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about \fBtdm\fP and its options
-.sp 1
-.RE
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdm/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdm/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Steffen Hansen <hansen@kde.org>
-.br
-Thomas Tanghus <tanghus@earthling.net>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.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/tdebase/debian/man/tdm_config-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.1
deleted file mode 100644
index b8753b168..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdm_config
-\- helper programm for tdm to read configuration files
-.SH SYNOPSIS
-\fBtdm_config\fP
-.SH DESCRIPTION
-\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
-.SH SEE ALSO
-\fBtdm\fP(1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/tdm_greet-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.1
deleted file mode 100644
index 10b7bde6e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
-.SH NAME
-tdm_greet
-\- TDE greeter module for tdm
-.SH SYNOPSIS
-\fBtdm_greet\fP
-.SH DESCRIPTION
-\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdebase/debian/man/tdmctl-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1
deleted file mode 100644
index 82be6ae16..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1
+++ /dev/null
@@ -1,220 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
-.SH NAME
-tdmctl
-\- tdm remote control application
-.SH SYNOPSIS
-\fBtdmctl\fP [options] [command [command arguments]]
-.SH DESCRIPTION
-\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
-.sp 1
-There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
-.sp 1
-The directory in which the sockets are located is determined this way:
-.RS 3
-\- the \fB\-s\fP option is examined
-.br
-\- the $DM_CONTROL variable is examined
-.br
-\- the tdm config file is searched for the FifoDir key
-.br
-.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
-.RE
-.sp 1
-If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
-display\-specific control socket will be used, otherwise the global one.
-.sp 1
-Tokens in the command and the reply are tab\-separated.
-Command arguments can be specified as separate command line parameters,
-in which case they are simply concatenated with tabs in between.
-.sp 1
-If the command is '\-', \fBtdmctl\fP reads commands from stdin.
-The default command is 'caps'.
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B \-h \-help
-print help message.
-.TP
-.B \-g \-global
-Use global control socket even if $DISPLAY is set
-.TP
-.B \-d \-display
-Override $DISPLAY
-.TP
-.B \-s \-sockets
-Override $DM_CONTROL
-.TP
-.B \-c \-config
-Use alternative tdm config file
-.SS Commands:
-.br
-.SS Global commands:
-.TP 
-.B login
-display (now|schedule) user password [session_arguments]
-.br
- login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
-.br
-session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
-.SS Per\-display commands:
-.TP 
-.B lock
-The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
-.TP 
-.B unlock
-Reverse the effect of "lock": re\-enable auto\-relogin.
-.TP 
-.B suicide
-The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
-.SS Commands for all sockets:
-.TP
-.B caps
-Returns a list of this socket's capabilities:
-.IP "    \- tdm"
-identifies tdm, in case some other DM implements this protocol, too.
-.IP "    \- list, activate, lock, suicide, login"
-the respective command is supported.
-.IP "    \- bootoptions"
-the "listbootoptions" command and the "=" option to "shutdown" are supported.
-.IP "    \- shutdown <list>"
-"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
-.IP "    \- shutdown"
-"shutdown" is supported and allowed to everybody.
-.IP "    \- nuke <list>"
-forced shutdown is allowed to the listed users.
-.IP "    \- nuke"
-forced shutdown is allowed to everybody.
-.IP "    \- reserve <number>"
-reserve displays are configured and <number> are available at this time.
-.TP 
-\fBlist\fP [all|alllocal]
-.br
-Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
-.sp 1
-Each session entry is a comma\-separated tuple of:
-.RS 7
-\- Display or TTY name
-.br
-\- VT name for local sessions
-.br
-\- Logged in user's name, empty for passive sessions and outgoing
-.br
-  remote sessions (local chooser mode)
-.br
-\- Session type or remote host for outgoing remote sessions,
-.br
-  empty for passive sessions
-.br
-\- A flag field:
-.RS 5
-\- "t" for tty sessions
-.br
-\- "*" for the display belonging to the requesting socket
-.br
-\- "!" for sessions that cannot be killed by the requesting
-.br
-  socket
-.br
-\- New flags might be added later
-.br
-.RE
-\- New fields might be added later
-.RE
-.TP
-\fBreserve\fP [timeout in seconds]
-.br
-Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-\fBactivate\fP (vt|display)
-.br
-Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-.B listbootoptions
-List available boot options.
-.br
-=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
-.TP
-\fBshutdown\fP (reboot|halt) [=bootchoice]
-.br
-  (ask|trynow|forcenow|schedule|start
-.br
-   (\-1|end (force|forcemy|cancel)))
-.br
-.RS 7
-Request a system shutdown, either a reboot or a halt/poweroff.
-.sp 1
-An OS choice for the next boot may be specified from the list returned by "listbootoptions".
-.sp 1
-Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
-.sp 1
-start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
-.sp 1
-end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
-.RS 3
-- "cancel" \- give up the shutdown.
-.br
-- "force" \- shut down nonetheless.
-.br
-- "forcemy" \- shut down nonetheless if all active sessions
-.br
-   belong to the requesting user. Only for per\-display sockets.
-.RE
-.sp 1
-start and end are specified in seconds since the UNIX epoch.
-.sp 1
-"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
-.sp 1
-"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
-.RE
-.TP
-\fBshutdown cancel\fP [local|global]
-.br
-Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
-.TP
-\fBshutdown status\fP
-Return a list with information about shutdowns.
-.br
-The entries are comma\-separated tuples of:
-.RS 10
-\- ("global"|"local") \- pending vs. queued shutdown. A local
-.br
-  entry can be returned only by a per\-display socket.
-.br
-\- ("halt"|"reboot")
-.br
-\- start
-.br
-\- end
-.br
-\- ("ask"|"force"|"forcemy"|"cancel")
-.br
-\- Numeric user ID of the requesting user, \-1 for the global
-.br
-  socket.
-.br
-\- The next boot OS choice or "\-" for none.
-.br
-\- New fields might be added later.
-.RE
-.SH SEE ALSO
-.BR tdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about the command sockets (and \fBtdm\fP)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.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/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff
index 45798364e..ce438ad29 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/disable_default_tdm_theme.diff
@@ -1,6 +1,6 @@
 --- a/tdm/config.def
 +++ b/tdm/config.def
-@@ -2644,9 +2644,9 @@
+@@ -2654,9 +2654,9 @@
  
  Key: UseTheme
  Type: bool
diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 598cd7092..a4ced0644 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,6 +1,6 @@
 --- a/starttde
 +++ b/starttde
-@@ -288,17 +288,17 @@
+@@ -414,17 +414,17 @@
    . "$tdehome/share/config/startupconfig"
  fi
  
@@ -27,5 +27,5 @@
 +#  fi
 +#fi
  
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
+ # An XCursor mouse theme is needed to work with kded or ksmserver.
  if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 79aebbd1d..1b53be325 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -2,8 +2,8 @@ diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
 index dd64b58..0af3e44 100644
 --- a/kate/data/kwrite.desktop
 +++ b/kate/data/kwrite.desktop
-@@ -109,3 +109,4 @@ Terminal=false
+@@ -12,3 +12,4 @@ Terminal=false
  X-TDE-InitialPreference=8
  X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;TextEditor;
+ Categories=Qt;TDE;Utility;TextEditor;
 +NoDisplay=true
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 608802a75..64adee330 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
 index 6003b68..f33e1f4 100644
 --- a/knetattach/knetattach.desktop
 +++ b/knetattach/knetattach.desktop
-@@ -80,3 +80,4 @@ Terminal=false
+@@ -11,3 +11,4 @@ Terminal=false
  X-TDE-StartupNotify=true
  Categories=Qt;TDE;Network;
  X-DocPath=knetattach/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bbb613a9..e5b89e2ba 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -1,6 +1,6 @@
 --- tdebase/kpersonalizer/kpersonalizer.desktop-orig	2005-03-17 01:05:16.091600616 +0000
 +++ tdebase/kpersonalizer/kpersonalizer.desktop	2005-03-17 01:05:23.678447240 +0000
-@@ -77,3 +77,4 @@
+@@ -13,3 +13,4 @@
  X-DCOP-ServiceType=Multi
  Categories=Qt;TDE;Settings;
  OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index e12245486..ef79cc8eb 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -2,7 +2,7 @@ Index: b/konqueror/konquerorsu.desktop
 ===================================================================
 --- a/konqueror/konquerorsu.desktop
 +++ b/konqueror/konquerorsu.desktop
-@@ -88,3 +88,4 @@
+@@ -11,3 +11,4 @@
  
  Categories=Qt;TDE;X-TDE-System-su;
  OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index 009d6f9db..e8f88b7f4 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefon
 index 5d5e2b8..c989adf 100644
 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
 +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -99,3 +99,4 @@ Terminal=false
+@@ -10,3 +10,4 @@ Terminal=false
  X-TDE-InitialPreference=1
  Categories=Qt;TDE;Graphics;
  X-DocPath=tdefontview/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 3eab104cb..e1d2567bd 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
@@ -1,6 +1,6 @@
 --- tdebase/kpager/kpager.desktop
 +++ tdebase/kpager/kpager.desktop
-@@ -96,3 +96,4 @@
+@@ -11,3 +11,4 @@
  X-TDE-StartupNotify=false
  X-DCOP-ServiceType=Unique
  Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
index a46ab143c..bfac9d8ea 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
@@ -1,6 +1,6 @@
 --- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
 +++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
-@@ -90,3 +90,4 @@
+@@ -9,3 +9,4 @@
  Terminal=false
  X-DCOP-ServiceType=Multi
  Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index baeb8bfd5..ffddad5b1 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -11,7 +11,7 @@
  	TQHBoxLayout* hbuttonbox;
 --- a/ksmserver/shutdowndlg.cpp
 +++ b/ksmserver/shutdowndlg.cpp
-@@ -697,7 +697,7 @@
+@@ -726,7 +726,7 @@
  							2 * KDialog::spacingHint() );
  
  	// default factor
@@ -20,3 +20,14 @@
  
  	// slighty more space for the new logout
  	int factor = 2;
+--- a/kcontrol/smserver/kcmsmserver.cpp
++++ b/kcontrol/smserver/kcmsmserver.cpp
+@@ -94,7 +94,7 @@
+ 
+   c->setGroup("Logout");
+   dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+-  dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false));
++  dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", true));
+   dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
+   dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
+   dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 8db1221a5..98fae0e38 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -1,6 +1,6 @@
 --- tdebase-3.5.7/kfind/Kfind.desktop
 +++ tdebase-3.5.7/kfind/Kfind.desktop
-@@ -73,3 +73,4 @@
+@@ -9,3 +9,4 @@
  X-TDE-StartupNotify=true
  OnlyShowIn=TDE;
  Categories=Qt;TDE;Core;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
index c312b6fb7..95e6e4116 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
@@ -1,6 +1,6 @@
 --- tdebase-3.5.8/tdm/backend/dm.c	2008-02-13 23:59:17.000000000 +0200
 +++ tdebase-3.5.8/tdm/backend/dm.c	2008-02-14 11:22:41.000000000 +0200
-@@ -996,9 +996,14 @@ ReapChildren( void )
+@@ -1026,9 +1026,14 @@ ReapChildren( void )
  				/* don't kill again */
  				break;
  			case running:
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules
index f7e6bb34d..677ef4dff 100755
--- a/ubuntu/_base/core/tdebase/debian/rules
+++ b/ubuntu/_base/core/tdebase/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
@@ -45,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
  -DWITH_LDAP="ON" \
  -DWITH_SAMBA="ON" \
+ -DWITH_SFTP="ON" \
  -DWITH_LIBUSB="ON" \
  -DWITH_LIBRAW1394="ON" \
  -DWITH_OPENEXR="ON" \
@@ -54,7 +54,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_XRANDR="ON" \
  -DWITH_XINERAMA="ON" \
  -DWITH_SENSORS="ON" \
- -DWITH_HAL="OFF" \
  -DWITH_TDEHWLIB="ON" \
  -DWITH_XDMCP="ON" \
  -DWITH_XRENDER="ON" \
@@ -64,7 +63,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_UPOWER="ON" \
  -DWITH_LIBART="ON" \
  -DWITH_LIBCONFIG="ON" \
- -DWITH_PCRE="ON" \
+ -DWITH_PCRE2="ON" \
  -DWITH_KRB5="ON"
 
 DEB_FIXPERMS_EXCLUDE := \
@@ -75,6 +74,9 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
+DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+
 DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
@@ -113,9 +115,9 @@ binary-install/tdm-trinity::
 	install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
 
 binary-install/kcontrol-trinity::
-	mkdir -p debian/kcontrol/etc/udev/rules.d
+	mkdir -p debian/$(cdbs_curpkg)/etc/udev/rules.d
 	chmod +x debian/usermap.pl
-	debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules
+	debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/$(cdbs_curpkg)/etc/udev/logitechmouse.rules
 
 install/klipper-trinity::
 	sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
index ffd4cc04a..eb09b1d5d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -17,6 +17,10 @@ debian/tmp/opt/trinity/share/apps/kcmcss/template.css
 debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_black.pcf.gz
 debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_white.pcf.gz
 debian/tmp/opt/trinity/share/apps/kcminput/cursor_small_white.pcf.gz
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse0.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse1.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse2.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse3.png
 debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_lh.png
 debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_rh.png
 debian/tmp/opt/trinity/share/apps/kcminput/pics/doubleclick_1.png
@@ -79,34 +83,7 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XOsview.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/Xpdf.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XTerm.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/XV.ad
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/AtlasGreen.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BeOS.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlackOnWhite.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/BlueSlate.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/CDE.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc
-debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/*.kcsrc
 debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc
 debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
@@ -338,6 +315,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
@@ -514,94 +494,9 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-p
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png
-debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa_url.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alltheweb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/altavista.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/amg.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/appsy.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/austronaut.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/backports.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugno.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/call.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/citeseer.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cpan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan_cat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dbug.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/deb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dmoz.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/docbook.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/doi.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2es.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2it.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/es2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/excite.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/feedster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/foldoc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freedb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freshmeat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/froogle.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fsd.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_advanced.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_groups.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_images.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_lucky.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_movie.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_news.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/gracenote.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/grec.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hotbot.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary_thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/imdb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/it2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/jeeves.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/katatudo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde_websvn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/leo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/lycos.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/mamma.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/metacrawler.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/msdn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/netcraft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-telephone.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-teletekst.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/pgpkeys.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/php.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/python.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt3.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rae.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rfc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rpmfind.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ruby_application_archive.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/seek.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/sourceforge.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technorati.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technoratitags.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/tvtome.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/uspto.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/vivisimo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/voila.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/webster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop
+debian/tmp/opt/trinity/share/services/searchproviders/*.desktop
 debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop
 debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop
 debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 9b8eec783..f0dff828a 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -156,6 +156,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/xz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zeroconf
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zip
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/mac.png
+debian/tmp/opt/trinity/share/man/man1/tdeio_media_mounthelper.1
+debian/tmp/opt/trinity/share/man/man1/ktrash.1
 debian/tmp/opt/trinity/share/mimelnk/inode/system_directory.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/audiocd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/blankbluray.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
deleted file mode 100644
index 249292ad7..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdeio_media_mounthelper-trinity.1
-debian/man/ktrash-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 49942d98a..c77323dc1 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -1,6 +1,8 @@
 debian/tmp/opt/trinity/bin/migratekde3
 debian/tmp/opt/trinity/bin/r14-xdg-update
 debian/tmp/opt/trinity/bin/tde_release_notes
+debian/tmp/opt/trinity/bin/tde_license_info
+debian/tmp/opt/trinity/bin/tde_show_license_info
 debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/tdeinit_phase1
 debian/tmp/opt/trinity/bin/tdeinit_displayconfig
@@ -34,8 +36,6 @@ debian/tmp/opt/trinity/lib/trinity/kcminit_startup.la
 debian/tmp/opt/trinity/lib/trinity/kcminit_startup.so
 debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.la
 debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.so
-debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.la
-debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.so
 debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.la
 debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.so
 debian/tmp/opt/trinity/lib/trinity/kded_khotkeys.la
@@ -75,7 +75,9 @@ debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
 debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
+debian/tmp/opt/trinity/share/apps/kxkb/eventsrc
 debian/tmp/opt/trinity/share/autostart/tde_release_notes.desktop
+debian/tmp/opt/trinity/share/autostart/tde_license_info.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
@@ -100,3 +102,20 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png
 debian/tmp/opt/trinity/share/services/kxkb.desktop
+debian/tmp/opt/trinity/share/services/kded/khotkeys.desktop
+debian/tmp/opt/trinity/share/man/man1/drkonqi.1
+debian/tmp/opt/trinity/share/man/man1/kblankscrn.kss.1
+debian/tmp/opt/trinity/share/man/man1/kcheckpass.1
+debian/tmp/opt/trinity/share/man/man1/kcminit.1
+debian/tmp/opt/trinity/share/man/man1/kdcop.1
+debian/tmp/opt/trinity/share/man/man1/kdialog.1
+debian/tmp/opt/trinity/share/man/man1/khotkeys.1
+debian/tmp/opt/trinity/share/man/man1/knetattach.1
+debian/tmp/opt/trinity/share/man/man1/krandom.kss.1
+debian/tmp/opt/trinity/share/man/man1/kreadconfig.1
+debian/tmp/opt/trinity/share/man/man1/kstart.1
+debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1
+debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxkb.1
+debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1
+debian/tmp/opt/trinity/share/man/man1/tdesu.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
index 975b98403..a384ff52d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
+opt/trinity/share/man/man1/tdesu.1 opt/trinity/share/man/man1/tdesud.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
index 6501cf36b..ddaa5b274 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
@@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
-tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
-tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
deleted file mode 100644
index 92b784172..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
+++ /dev/null
@@ -1,17 +0,0 @@
-debian/man/drkonqi-trinity.1
-debian/man/kblankscrn.kss-trinity.1
-debian/man/kcheckpass-trinity.1
-debian/man/kcminit-trinity.1
-debian/man/kdcop-trinity.1
-debian/man/tdedebugdialog-trinity.1
-debian/man/tdesu-trinity.1
-debian/man/kdialog-trinity.1
-debian/man/khotkeys-trinity.1
-debian/man/tdeio_system_documenthelper-trinity.1
-debian/man/knetattach-trinity.1
-debian/man/krandom.kss-trinity.1
-debian/man/kreadconfig-trinity.1
-debian/man/kstart-trinity.1
-debian/man/ksystraycmd-trinity.1
-debian/man/kwriteconfig-trinity.1
-debian/man/kxkb-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
index a951e7daf..a113fb502 100644
--- a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
@@ -36,3 +36,4 @@ debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook
+debian/tmp/opt/trinity/share/man/man1/tdepasswd.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages
deleted file mode 100644
index 1a6f4abad..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
index ce3ec87b7..5611bb731 100644
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
@@ -123,6 +123,9 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kjobviewer.1
+debian/tmp/opt/trinity/share/man/man1/kprinter.1
+debian/tmp/opt/trinity/share/man/man1/tdeprintfax.1
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
index 52cd10d88..8410a13ae 100644
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,2 @@
 tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
 tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
-tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
-tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages
deleted file mode 100644
index 55b9bfae7..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/tdeprintfax-trinity.1
-debian/man/kjobviewer-trinity.1
-debian/man/kprinter-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst
deleted file mode 100644
index c812a9390..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdeprint-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
index 26fc8427c..8e5c207d7 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
@@ -40,7 +40,7 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
                                 head -n 1)
   # the debconf configuration stores the package name,
   # while the configuration files point to the binary name
-  # tdm-trinity package name must be used for the tdm binary
+  # therefore tdm-trinity package name must be used for the tdm binary
   if [ "$CURRENT_DEFAULT" = "/opt/trinity/bin/tdm" ]; then
     CURRENT_DEFAULT=${THIS_PACKAGE}
   else
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
index 90c5256de..aaa1719bb 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
@@ -52,3 +52,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/tdmrc-ref.docbook
+debian/tmp/opt/trinity/share/man/man1/gentdmconf.1
+debian/tmp/opt/trinity/share/man/man1/krootimage.1
+debian/tmp/opt/trinity/share/man/man1/tdm.1
+debian/tmp/opt/trinity/share/man/man1/tdm_config.1
+debian/tmp/opt/trinity/share/man/man1/tdm_greet.1
+debian/tmp/opt/trinity/share/man/man1/tdmctl.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages
deleted file mode 100644
index 690a0f462..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/man/gentdmconf-trinity.1
-debian/man/tdm-trinity.1
-debian/man/tdm_config-trinity.1
-debian/man/tdmctl-trinity.1
-debian/man/tdm_greet-trinity.1
-debian/man/krootimage-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
index 23de3a247..d51bcd8dc 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
@@ -172,4 +172,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   fi
 fi
 
+#DEBHELPER#
+
 exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates b/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
index ac4f2df43..9c54e0e9d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
@@ -23,8 +23,8 @@ Description: internal use only
 Template: tdm-trinity/stop_running_server_with_children
 Type: boolean
 Default: false
-_Description: Stop the tdm-trinity daemon?
- The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade
+_Description: Stop the tdm daemon?
+ The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade
  and removal, but it appears to be managing at least one running X session.
  .
  If tdm is stopped now, any X sessions it manages will be terminated.
diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install
index 381a173be..f9b6061d4 100644
--- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install
@@ -11,24 +11,24 @@ debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la
 debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so
 debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la
 debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so
-debian/tmp/opt/trinity/lib/trinity/twin3_b2.la
-debian/tmp/opt/trinity/lib/trinity/twin3_b2.so
-debian/tmp/opt/trinity/lib/trinity/twin3_default.la
-debian/tmp/opt/trinity/lib/trinity/twin3_default.so
-debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la
-debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so
-debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la
-debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so
-debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la
-debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so
-debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la
-debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so
-debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la
-debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so
-debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la
-debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so
-debian/tmp/opt/trinity/lib/trinity/twin3_web.la
-debian/tmp/opt/trinity/lib/trinity/twin3_web.so
+debian/tmp/opt/trinity/lib/trinity/twin_b2.la
+debian/tmp/opt/trinity/lib/trinity/twin_b2.so
+debian/tmp/opt/trinity/lib/trinity/twin_default.la
+debian/tmp/opt/trinity/lib/trinity/twin_default.so
+debian/tmp/opt/trinity/lib/trinity/twin_keramik.la
+debian/tmp/opt/trinity/lib/trinity/twin_keramik.so
+debian/tmp/opt/trinity/lib/trinity/twin_laptop.la
+debian/tmp/opt/trinity/lib/trinity/twin_laptop.so
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys.la
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys.so
+debian/tmp/opt/trinity/lib/trinity/twin_plastik.la
+debian/tmp/opt/trinity/lib/trinity/twin_plastik.so
+debian/tmp/opt/trinity/lib/trinity/twin_quartz.la
+debian/tmp/opt/trinity/lib/trinity/twin_quartz.so
+debian/tmp/opt/trinity/lib/trinity/twin_redmond.la
+debian/tmp/opt/trinity/lib/trinity/twin_redmond.so
+debian/tmp/opt/trinity/lib/trinity/twin_web.la
+debian/tmp/opt/trinity/lib/trinity/twin_web.so
 debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la
 debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so
 debian/tmp/opt/trinity/lib/trinity/twin_default_config.la
@@ -54,12 +54,11 @@ debian/tmp/opt/trinity/share/applications/tde/twindecoration.desktop
 debian/tmp/opt/trinity/share/applications/tde/twinoptions.desktop
 debian/tmp/opt/trinity/share/applications/tde/twinrules.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinactiveborders.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop
-debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl
-debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh
 debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh
@@ -75,19 +74,7 @@ debian/tmp/opt/trinity/share/apps/twin/eventsrc
 debian/tmp/opt/trinity/share/apps/twin/keramik.desktop
 debian/tmp/opt/trinity/share/apps/twin/laptop.desktop
 debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop
-debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png
-debian/tmp/opt/trinity/share/apps/twin/pics/close.png
-debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png
-debian/tmp/opt/trinity/share/apps/twin/pics/fog.png
-debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png
-debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png
-debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png
-debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png
-debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png
-debian/tmp/opt/trinity/share/apps/twin/pics/menu.png
-debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png
-debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png
-debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png
+debian/tmp/opt/trinity/share/apps/twin/pics/*
 debian/tmp/opt/trinity/share/apps/twin/plastik.desktop
 debian/tmp/opt/trinity/share/apps/twin/quartz.desktop
 debian/tmp/opt/trinity/share/apps/twin/redmond.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/usermap.pl b/ubuntu/_base/core/tdebase/debian/usermap.pl
index 9c8c61f26..bd87e2d72 100644
--- a/ubuntu/_base/core/tdebase/debian/usermap.pl
+++ b/ubuntu/_base/core/tdebase/debian/usermap.pl
@@ -34,7 +34,7 @@ sub parse_usermap_line {
 
     my @rule;
     while (my ($key, $flag) = each(%flags)) {
-	hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",);
+	hex($match{match_flags}) & $flag and push @rule, qq(ATTRS{$key}=="$match{$key}",);
     }
     push @rule,
     (
@@ -47,9 +47,9 @@ sub parse_usermap_line {
     print join(' ', @rule) . "\n";
 }
 
-print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n";
+print "DRIVERS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n";
 print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n";
-print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n";
+print "SUBSYSTEMS!=\"usb\"\, GOTO=\"kcontrol_rules_end\"\n\n";
 
 foreach my $usermap (@ARGV) {
     open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";
diff --git a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdebindings/debian/cdbs/versions.pl b/ubuntu/_base/core/tdebindings/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdebindings/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdebindings/debian/compat b/ubuntu/_base/core/tdebindings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdebindings/debian/compat
+++ b/ubuntu/_base/core/tdebindings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index 52758928a..eeba9b436 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
 Source: tdebindings-trinity
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
- tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
+Build-Depends: tde-cdbs (>= 0.4.43), debhelper (>= 10~),
+ python3-all-dev, dh-python, python3-setuptools, quilt, gawk,
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
+ tdelibs14-trinity-dev,
  ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
 Section: devel
 Priority: optional
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdebindings-trinity (<< 4:14.0.0~)
 Breaks: kdebindings-trinity (<< 4:14.0.0~)
-Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
+Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
 Description: TDE bindings metapackage
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -65,7 +65,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
 Section: libs
 Replaces: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -79,7 +79,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -110,7 +110,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
 Section: libs
 Replaces: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
@@ -139,7 +139,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
 Section: libs
 Replaces: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
@@ -211,13 +211,11 @@ Description: SMOKE Binding Library to TDE - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: python-dcop-trinity
+Package: python3-dcop-trinity
 Architecture: any
 Section: python
-Replaces: python-dcop-kde3 (<< 4:14.0.0~), python-dcop-trinity (<< 4:14.0.0~)
-Breaks: python-dcop-kde3 (<< 4:14.0.0~), python-dcop-trinity (<< 4:14.0.0~)
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
diff --git a/ubuntu/_base/core/tdebindings/debian/juic-trinity.install b/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
index b29210f2c..685deb0bf 100644
--- a/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
@@ -4,3 +4,4 @@ qtjava/designer/juic/common/*.xsl	/opt/trinity/share/juic/common
 qtjava/designer/juic/java/*.xml	/opt/trinity/share/juic/java
 qtjava/designer/juic/java/*.xsl	/opt/trinity/share/juic/java
 qtjava/designer/juic/juic.xsl	/opt/trinity/share/juic
+debian/tmp/opt/trinity/share/man/man1/juic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages
deleted file mode 100644
index 3b2609197..000000000
--- a/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/juic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..9196450ca 100644
--- a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
@@ -1 +1,2 @@
 debian/tmp/opt/trinity/bin/dcopidl2java
+debian/tmp/opt/trinity/share/man/man1/dcopidl2java.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
deleted file mode 100644
index 74e63033b..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/dcopidl2java.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
index 33de286bb..4caa2d2ab 100644
--- a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -9,4 +9,8 @@ debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 debian/tmp/opt/trinity/lib/*/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/*/*/*/korundum.la
 
+debian/tmp/opt/trinity/share/man/man1/krubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbtdesh.1
+debian/tmp/opt/trinity/share/man/man1/rbtdeapi.1
+
 korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
deleted file mode 100644
index ab2f0ee35..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbtdesh.1
-debian/local/rbtdeapi.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
index a18befa22..e778c96c1 100644
--- a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,9 @@ debian/tmp/opt/trinity/lib/*/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/*/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/*/*/*/tqui.la
 
+debian/tmp/opt/trinity/share/man/man1/qtrubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbqtsh.1
+debian/tmp/opt/trinity/share/man/man1/rbqtapi.1
+debian/tmp/opt/trinity/share/man/man1/rbuic.1
+
 qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
deleted file mode 100644
index f2dc6de31..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/local/qtrubyinit.1
-debian/local/rbqtsh.1
-debian/local/rbqtapi.1
-debian/local/rbuic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1 b/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1
deleted file mode 100644
index 926d78391..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH LIBDCOP-JAVA 1 "July 31, 2002"
-.SH NAME
-dcopidl2java \- Convert a DCOP IDL file to Java language stubs
-.SH SYNOPSIS
-.B dcopidl2java
-.RI " [ " --no-skel " ]  [ " --no-stub " ]  [ " --package " " java-package " ] " file
-.SH DESCRIPTION
-This manual page documents briefly the
-.B dcopidl2java
-command.
-.PP
-\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file,
-for use with the libdcop-java Java DCOP bindings.
-
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B --no-skel
-Do not generate skeleton code.
-.TP
-.B --no-stub
-Do not generate stub implementation code.
-.TP
-.B --package java-package 
-Set the name of the Java package to use in the generated code.
-.SH AUTHOR
-This manual page was written by Peter Hawkins <peterh@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdebindings/debian/local/juic.1 b/ubuntu/_base/core/tdebindings/debian/local/juic.1
deleted file mode 100644
index 9120f44d3..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/juic.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual"
-.SH NAME
-juic \- The Qt Java UI Compiler
-.SH SYNOPSIS
-.B juic
-[options] uifile
-.SH DESCRIPTION
-Juic is the Qt Java UI Compiler.  It generates Java\*(tm code from a
-XML UI Description file.  This XML UI Description file can be
-generated by Qt Designer, Qt's graphical UI designer.  Juic is the
-Java\*(tm equivalent for the C++ uic program.
-
-Juic generates Java code for the Qt UI Description File passed to it,
-and outputs it on standard output.
-.SH OPTIONS
-.TP
-.B \-proc   <xsltproc|xalan|saxon>
-Tells juic which xslt processor to use internally.  Possible values
-are "xsltproc", "xalan", "saxon".  The processor you specify must be
-available in the PATH or juic will give an error.  The default is to
-use xsltproc if it's available, and use saxon otherwise.
-.TP
-.B \-package   <the.package.for.the.class>
-Tells juic to add the given package declaration to the generated java
-class.
-.TP
-.B \-abstract   <true|false>
-Tells juic whether or not to define slots as abstract.
-.TP
-.B \-images   <dir>
-Tells juic where to find the images used in the given ui file.
-Default is "images".
-.TP
-.B \-os   <unix|msdos|mac>
-Tells juic what newline style to use in the generated java file.  Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively.
-.SH AUTHOR
-Marco Ladermann
-.SH SEE ALSO
-uic(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1 b/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1
deleted file mode 100644
index f8a405452..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual"
-.SH NAME
-krubyinit \- Start Korundum Ruby Scripts Faster
-.SH SYNOPSYS
-.B krubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Krubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the Korundum library ( the Ruby TDE bindings ).  It uses
-the tdeinit system to start the app so that they start a little bit
-faster when started in a running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of Korundum, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Krubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1 b/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1
deleted file mode 100644
index 1ab6e7f28..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual"
-.SH NAME
-qtrubyinit \- Start Qt Ruby Scripts Faster
-.SH SYNOPSYS
-.B qtrubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the tdeinit system to start
-the app so that they start a little bit faster when started in a
-running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of QtRuby, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Qtrubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1 b/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1
deleted file mode 100644
index 7cafb5b8c..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtapi \- A QtRuby Introspection Tool
-.SH SYNOPSIS
-.B rbqtapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbqtapi is a QtRuby Introspection Tool, similar to javap(1).  Use it
-to find a list of method for a certain QtRuby class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbtdeapi(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1 b/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1
deleted file mode 100644
index bda49d962..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtsh \- An Interactive QtRuby Shell
-.SH SYNOPSIS
-.B rbqtsh
-[options]
-.SH DESCRIPTION
-Rbqtsh is an interactive QtRuby shell.  It shows a GUI dialog box
-where you can enter Ruby code using the QtRuby library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbtdesh(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1 b/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1
deleted file mode 100644
index e3d166225..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdeapi \- A Korundum TDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbtdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1 b/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1
deleted file mode 100644
index 6e792e7fa..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbtdesh
-[options]
-.SH DESCRIPTION
-Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum TDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbuic.1 b/ubuntu/_base/core/tdebindings/debian/local/rbuic.1
deleted file mode 100644
index d59caa1ac..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbuic.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual"
-.SH NAME
-rbuic \- The Qt Ruby UI Compiler
-.SH SYNOPSIS
-Generate implementation:
-.B rbuic
-[options] uifile
-.LP
-Generate subclass implementation:
-.B rbuic
-[options] -subimpl <classname> <uifile>
-.LP
-Generate image collection:
-.B rbuic
-[options] -embed <project> <image1> <image2> <image3> ...
-.SH DESCRIPTION
-Rbuic is the Qt Ruby UI Compiler.  It generates Ruby code from a XML
-UI Description file.  This XML UI Description file can be generated by
-Qt Designer, Qt's graphical UI designer.  Rbuic is the Ruby equivalent
-for the C++ uic program.
-
-When invoked to generate an implementation, rbuic generates Ruby code
-for the Qt UI Description File passed to it, and outputs it on
-standard output.
-
-When invoked to generate a subclass implementation, rbuic generates
-template Ruby code for a subclass of the widget in the Qt UI
-Description File passed to it, and outputs it on standard output.
-
-When invoked to generate an image collection, rbuic generates Ruby
-code containing the image data in strings.  This is useful to avoid
-having to distribute image files along with your application.  It is
-arguably more useful for C++ ( where the image strings can be compiled
-into an executable ), but still, it is available for Ruby as well.
-.SH OPTIONS
-.TP
-.B \-o <file>
-Write output to file rather than stdout.
-.TP
-.B \-p <indent>
-Set the indent in spaces (0 to use a tab)
-.TP
-.B \-nofwd
-Omit imports of custom widgets
-.TP
-.B \-kde
-Use TDE widgets, require 'Korundum' extension
-.TP
-.B \-tr <func>
-Use func(...) rather than trUtf8(...) for i18n
-.TP
-.B \-x
-Generate extra code to test the class
-.TP
-.B \-version
-Print the Rbuic and Qt versions
-.TP
-.B \-help
-Display some help information.
-.SH AUTHOR
-Germain Garand
-Phil Thompson
-.SH SEE ALSO
-uic(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install
deleted file mode 100644
index 364b52d9d..000000000
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/python2.*/site-packages
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples
diff --git a/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install
new file mode 100644
index 000000000..8123736e6
--- /dev/null
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/lib/python3/dist-packages
diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules
index fce67d163..3322c4c3f 100755
--- a/ubuntu/_base/core/tdebindings/debian/rules
+++ b/ubuntu/_base/core/tdebindings/debian/rules
@@ -3,13 +3,9 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 DEB_BUILDDIR := $(DEB_SRCDIR)
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
@@ -33,7 +29,7 @@ endif
 DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity  \
 		  	    DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python'
 
-DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk
+DEB_COMPRESS_EXCLUDE_ALL += .java .ui .js .rb .map .wav .bmp .cpp .sk
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
@@ -110,20 +106,10 @@ common-install-arch:: stamp-install-dcopjava
 ###
 
 binary-install/juic-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
 
-binary-install/libdcop3-java-trinity-dev::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libkorundum0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libqt0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/python-dcop-trinity::
-	${DH_PYTHON2} -p$(cdbs_curpkg)
+binary-install/python3-dcop-trinity::
+	dh_python3 -p$(cdbs_curpkg)
 
 ###
 
diff --git a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeedu/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeedu/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeedu/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeedu/debian/compat b/ubuntu/_base/core/tdeedu/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeedu/debian/compat
+++ b/ubuntu/_base/core/tdeedu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeedu/debian/control b/ubuntu/_base/core/tdeedu/debian/control
index d853f11f8..b5d153b0c 100644
--- a/ubuntu/_base/core/tdeedu/debian/control
+++ b/ubuntu/_base/core/tdeedu/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>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libzarith-ocaml-dev, libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript
 Standards-Version: 3.8.4
 
 Package: tdeedu-trinity
diff --git a/ubuntu/_base/core/tdeedu/debian/rules b/ubuntu/_base/core/tdeedu/debian/rules
index dc2f755ee..6d19da7b0 100755
--- a/ubuntu/_base/core/tdeedu/debian/rules
+++ b/ubuntu/_base/core/tdeedu/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_INSTALL_DOCS_ALL :=
 
diff --git a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdegames/debian/cdbs/versions.pl b/ubuntu/_base/core/tdegames/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdegames/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdegames/debian/compat b/ubuntu/_base/core/tdegames/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdegames/debian/compat
+++ b/ubuntu/_base/core/tdegames/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdegames/debian/control b/ubuntu/_base/core/tdegames/debian/control
index 895beb8cf..81e00be7e 100644
--- a/ubuntu/_base/core/tdegames/debian/control
+++ b/ubuntu/_base/core/tdegames/debian/control
@@ -4,8 +4,8 @@ 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>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Standards-Version: 3.8.4
 
 Package: tdegames-trinity
@@ -89,7 +89,7 @@ Architecture: all
 Section: doc
 Replaces: libkdegames-kde3-doc (<< 4:14.0.0~), libkdegames-trinity-doc (<< 4:14.0.0~)
 Breaks: libkdegames-kde3-doc (<< 4:14.0.0~), libkdegames-trinity-doc (<< 4:14.0.0~)
-Recommends: tdelibs14-trinity-doc, libtqtinterface-doc
+Recommends: tdelibs14-trinity-doc
 Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev
 Description: API documentation for the Trinity games library
  This package contains the developers' documentation for libtdegames.
diff --git a/ubuntu/_base/core/tdegames/debian/rules b/ubuntu/_base/core/tdegames/debian/rules
index 4d50a84a3..a9298f39d 100755
--- a/ubuntu/_base/core/tdegames/debian/rules
+++ b/ubuntu/_base/core/tdegames/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 export kde_bindir = /opt/trinity/games
 
diff --git a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdegraphics/debian/cdbs/versions.pl b/ubuntu/_base/core/tdegraphics/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdegraphics/debian/compat b/ubuntu/_base/core/tdegraphics/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdegraphics/debian/compat
+++ b/ubuntu/_base/core/tdegraphics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control
index c9ddda5ef..8544bf136 100644
--- a/ubuntu/_base/core/tdegraphics/debian/control
+++ b/ubuntu/_base/core/tdegraphics/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>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut-dev | freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -379,8 +379,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
index c760fe7d7..b66fea000 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
@@ -10,6 +10,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcoloredit.png
+debian/tmp/opt/trinity/share/man/man1/kcolorchooser.1
+debian/tmp/opt/trinity/share/man/man1/kcoloredit.1
 
 debian/icons/kcolorchooser.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcolorchooser-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
deleted file mode 100644
index e4673b667..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kcolorchooser.1
-debian/man/kcoloredit.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
index 0eeb3b15f..994691b8f 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdvi.svgz
+debian/tmp/opt/trinity/share/man/man1/kdvi.1
 debian/tmp/opt/trinity/share/services/kdvimultipage.desktop
 
 debian/icons/kdvi.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages
deleted file mode 100644
index 6cab6e597..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdvi.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
index c38b88569..f49130c67 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
@@ -8,6 +8,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kfax.1
 
 debian/icons/kfax.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfax-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages
deleted file mode 100644
index 57b6c7961..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfax.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
index 90e21b08c..b8967972c 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfaxview.svgz
+debian/tmp/opt/trinity/share/man/man1/kfaxview.1
 debian/tmp/opt/trinity/share/services/kfaxmultipage.desktop
 debian/tmp/opt/trinity/share/services/kfaxmultipage_tiff.desktop
 
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..dbcda26a3 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
@@ -1,4 +1,2 @@
 kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so
-kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so
-kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so
 kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
deleted file mode 100644
index a30d1c56a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfaxview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
index add2d1e01..01ee36fbf 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
@@ -19,6 +19,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kghostview.png
+debian/tmp/opt/trinity/share/man/man1/kghostview.1
 debian/tmp/opt/trinity/share/services/kghostview_part.desktop
 
 debian/icons/kghostview.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages
deleted file mode 100644
index 8cfcbdec7..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kghostview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
index 0f1bc5dcc..da3a7592c 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
@@ -167,6 +167,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kolourpaint.svgz
+debian/tmp/opt/trinity/share/man/man1/kolourpaint.1
 
 debian/icons/kolourpaint.xpm		/opt/trinity/share/pixmaps
 debian/icons/kolourpaint-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
deleted file mode 100644
index a10ddf05a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kolourpaint.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
index 5330dc6ab..d25642f7a 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
@@ -27,6 +27,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
+debian/tmp/opt/trinity/share/man/man1/kooka.1
 
 debian/icons/kooka.xpm		/opt/trinity/share/pixmaps
 debian/icons/kooka-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages
deleted file mode 100644
index 319f8652c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kooka.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
index 640ebdb6e..189e43274 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kpdf.svgz
+debian/tmp/opt/trinity/share/man/man1/kpdf.1
 debian/tmp/opt/trinity/share/services/kpdf_part.desktop
 
 debian/icons/kpdf.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages
deleted file mode 100644
index 36f3caafb..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpdf.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
index 4cbc774ae..28ebee7e7 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
@@ -421,6 +421,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+debian/tmp/opt/trinity/share/man/man1/kpovmodeler.1
 
 debian/icons/kpovmodeler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpovmodeler-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
deleted file mode 100644
index 11c1a16f8..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpovmodeler.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
index 87fa208d5..a2aa52cd8 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
@@ -14,6 +14,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kruler.png
+debian/tmp/opt/trinity/share/man/man1/kruler.1
 
 debian/icons/kruler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kruler-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages
deleted file mode 100644
index aac20ba29..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kruler.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
index 9725e1d31..ac4bb7295 100644
--- a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ksnapshot.svgz
+debian/tmp/opt/trinity/share/man/man1/ksnapshot.1
 
 debian/icons/ksnapshot.xpm		/opt/trinity/share/pixmaps
 debian/icons/ksnapshot-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
deleted file mode 100644
index efb781eba..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksnapshot.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
index d8f2d8f7e..c880ff0a4 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
@@ -20,6 +20,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
+debian/tmp/opt/trinity/share/man/man1/kuickshow.1
 
 debian/icons/kuickshow.xpm		/opt/trinity/share/pixmaps
 debian/icons/kuickshow-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
index 89f453cea..121ed9a1b 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,2 @@
 kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
 kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
deleted file mode 100644
index 3eadda903..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuickshow.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
index ea22868e9..9c85b5c7d 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
@@ -52,6 +52,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
+debian/tmp/opt/trinity/share/man/man1/kview.1
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
diff --git a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages
deleted file mode 100644
index bad8bf322..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
index 78a5947e3..a36f0377a 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
@@ -23,6 +23,7 @@ debian/tmp/opt/trinity/share/config.kcfg/kviewshell.kcfg
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png
+debian/tmp/opt/trinity/share/man/man1/kviewshell.1
 debian/tmp/opt/trinity/share/services/emptymultipage.desktop
 debian/tmp/opt/trinity/share/services/djvumultipage.desktop
 debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop
diff --git a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
deleted file mode 100644
index 89af3c5f2..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kviewshell.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index 29764eb5d..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/libkscan.so
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..2aff7e3a2
--- /dev/null
+++ b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libkscan.so
+debian/tmp/opt/trinity/share/cmake/libkscan.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..5080bc09f 100644
--- a/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -2,3 +2,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h
 debian/tmp/opt/trinity/include/poppler-page-transition.h
 debian/tmp/opt/trinity/include/poppler-qt.h
 debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc
+debian/tmp/opt/trinity/share/cmake/libpoppler-tqt.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1 b/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1
deleted file mode 100644
index d0fd9cfbb..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KCOLORCHOOSER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcolorchooser \- TDE Color Chooser
-.SH SYNOPSIS
-.B kcolorchooser
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcolorchooser
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-TDE Color Chooser
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH AUTHOR
-KColorChooser was written by
-.nh
-Waldo Bastian <bastian@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1 b/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1
deleted file mode 100644
index 3318864e0..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH KCOLOREDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcoloredit \- TDE Color Palette Editor
-.SH SYNOPSIS
-.B kcoloredit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcoloredit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KColorEdit
-is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-File
-file to open
-.SH "SEE ALSO"
-The full documentation for
-.B kcoloredit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcoloredit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KColorEdit was written by
-.nh
-Artur Rataj <art@zeus.polsl.gliwice.pl>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1 b/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1
deleted file mode 100644
index f1df971ad..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KDVI "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kdvi \- TDE DVI Viewer
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdvi
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KDVI
-is a plugin for the KViewshell program which allows KViewshell to
-display DVI-files (.dvi) which are produced by the TeX typesetting
-system. KDVI supports many extensions of the DVI standard, for
-instance the inclusion of PostScript graphics or hyperlinks. More
-details, examples and all the technical specifications can be found in
-the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
-source of that file). 
-.P
-For up-to-date information, consult KDVI's home page. 
-.P
-TeX is a high-end typesetting system geared towards scientific, and in
-particular mathematical typesetting. More information about TeX and
-DVI can be found on the homepage of the TeX user group or the German
-German DANTE e.V..  
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH "SEE ALSO"
-The full documentation for
-.B kdvi
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kdvi
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand and
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kfax.1 b/ubuntu/_base/core/tdegraphics/debian/man/kfax.1
deleted file mode 100644
index ac7583ccf..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kfax.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH KFAX "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kfax \- TDE Fax Viewer
-.SH SYNOPSIS
-.B kfax
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfax
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-A program to display raw and tiffed fax images (g3, g3-2d, g4).
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-f\fR, \fB\-\-fine\fR
-Fine resolution
-.TP
-\fB\-n\fR, \fB\-\-normal\fR
-Normal resolution
-.TP
-\fB\-\-height\fR
-Height (number of fax lines)
-.TP
-\fB\-w\fR, \fB\-\-width\fR
-Width (dots per fax line)
-.TP
-\fB\-l\fR, \fB\-\-landscape\fR
-Turn image 90 degrees (landscape mode)
-.TP
-\fB\-u\fR, \fB\-\-upsidedown\fR
-Turn image upside down
-.TP
-\fB\-i\fR, \fB\-\-invert\fR
-Invert black and white.
-.TP
-\fB\-m\fR, \fB\-\-mem\fR <bytes>
-Limit memory use to 'bytes'. [8M]
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-Fax data is packed lsb first
-.TP
-\fB\-2\fR
-Raw files are g3-2d
-.TP
-\fB\-4\fR
-Raw files are g4
-.SS "Arguments:"
-.TP
-file(s)
-Fax file(s) to show
-.SH "SEE ALSO"
-The full documentation for
-.B kfax
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kfax
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KFax was written by
-.nh
-Bernd Johannes Wuebben <wuebben@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1
deleted file mode 100644
index 592c64c09..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KFAXVIEWER "1" "October 2007" TDE "TDE Application"
-.SH NAME
-kfaxviewer \- TDE fax viewer using kviewshell
-.SH SYNOPSIS
-.B kfaxview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page briefly documents the
-.B kfaxview
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program doesn't have a manual page.
-.PP
-A fax viewer for TDE using kviewshell.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another KFaxView instance.
-If it is, bring up the other KFaxView. Otherwise, load the file.
-.TP
-\fB\-g\fR, \fB\-\-goto\fR <pagenumber>
-Navigate to this page
-.TP
-.SS "Arguments:"
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KFaxview was written by
-.nh
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Francesco Pedrini<francesco.pedrini@gmail.com>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1
deleted file mode 100644
index be63ba0f3..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KGHOSTVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kghostview \- TDE PS/PDF Viewer
-.SH SYNOPSIS
-.B kghostview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KGhostView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B  KGhostView
-displays and prints PostScript (.ps, .eps) and Portable
-Document Format (.pdf) files. It a port to TDE of Tim Theisen's
-Ghostview program which uses Alladin Ghostscript to view documents
-prepared in Adobe's PostScript page description
-language. PostScript is the major page description language for
-printing on UNIX(rg systems and this application can be used to preview
-material intended for printing or for reading documents online.  
-.P
-You can use KGhostView with all recent versions of Ghostscript. Newer
-versions offer much improved performance which you can take advantage
-of with KGhostView.  
-.P
-If a document does not conform to the Adobe document structuring
-convention the functionality of the viewer is limited. For example, if
-there is no table of contents, skipping around the document and
-marking pages is not possible. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Location to open
-.SH "SEE ALSO"
-The full documentation for
-.B KGhostView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kghostview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KGhostView was written by
-.nh
-Wilco Greven <greven@kde.org>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe <donohoe@kde.org>,
-David Faure <faure@kde.org>,
-Daniel Duley <mosfet@kde.org> and
-Espen Sand <espen@kde.org>
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1 b/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1
deleted file mode 100644
index 42a126a85..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KPAINT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kolourpaint \- TDE Paint Program
-.SH SYNOPSIS
-.B kolourpaint
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KPaint
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPaint
-is a simple bitmap drawing program that can also be used to modify
-existing image files and convert between image file formats. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File or URL to open
-.SH "SEE ALSO"
-The full documentation for
-.B KPaint
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kolourpaint
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPaint was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Robert Williams <rwilliams@jrcmaui.com>,
-Mario Weilguni <mweilguni@kde.org>,
-Christian Oppel <uzs84g@uni-bonn.de>,
-John Califf <jcaliff@compuzone.net> and
-Laurent Montel <lmontel@mandrakesoft.com>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kooka.1 b/ubuntu/_base/core/tdegraphics/debian/man/kooka.1
deleted file mode 100644
index a8f34e419..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kooka.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KOOKA "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kooka \- TDE Scan & OCR Program
-.SH SYNOPSIS
-.B kooka
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kooka
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kooka
-is a TDE application which provides access to scanner
-hardware using the SANE library.
-.P
-Kooka helps you scan, save your
-image in the correct image format and perform \fBO\fRptical
-\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
-Schulenburg's and friends' Open Source ocr program.
-.P
-Kooka is a TDE application that enables easy scanning using SANE
-libraries. Therefore, SANE the package must be installed to use
-Kooka. Clear and concise use was the focus of its development. 
-.P
-Character recognition is also provided by the built-in text
-recognition program gocr. Install gocr to use this
-functionality. After character recognition is complete, the recognized
-material can be opened in the text editor Kate with just one click,
-where you can edit the contents. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-d\fR
-the SANE compatible device specification (e.g. umax:/dev/sg0) []
-.TP
-\fB\-g\fR
-gallery mode - do not connect to scanner []
-.SH "SEE ALSO"
-The full documentation for
-.B Kooka
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kooka
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-Kooka was written by
-.nh
-Klaas Freitag <freitag@suse.de> and
-Mat Colton <mat@colton.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1 b/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1
deleted file mode 100644
index fc0c59534..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPDF 1 "June 2006" "Trinity Desktop Environment" "pdf viewer"
-.SH NAME
-kpdf
-\- a TDE pdf viewer based on xpdf
-.SH SYNOPSIS
-\fBkpdf\fP [Qt\-options] [TDE\-options] [URL]
-.SH DESCRIPTION
-\fBkpdf\fP is a TDE PDF viewer based on \fBxpdf\fP code. Although being based on \fBxpdf\fP code, \fBkpdf\fP has some unique features like continuous mode and presentation support.
-.sp 1
-The PDF format is widely used for publishing documents that are mostly not meant to be edited again. \fBkpdf\fP is only a viewer for these files and therefore it doesn't provide any functionality to edit or create PDF documents.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Document to open
-.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 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 
-.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 
-
-.SH SEE ALSO
-\fBxpdf\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kpdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kpdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Wilco Greven <greven@kde.org>
-.br
-Christophe Devriese <oelewapperke@oelewapperke.org>
-.br
-Laurent Montel <montel@kde.org>
-.br
-Albert Astals Cid <astals11@terra.es>
-.br
-Enrico Ros <eros.kde@email.it>
-.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/tdegraphics/debian/man/kpovmodeler.1 b/ubuntu/_base/core/tdegraphics/debian/man/kpovmodeler.1
deleted file mode 100644
index 3d536d26e..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kpovmodeler.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH KPOVMODELER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kpovmodeler \- TDE Povray Modeler
-.SH SYNOPSIS
-.B kpovmodeler
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Povray Modeler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPovModeler
-is a 3D modeling application to generate POV-Ray scenes.
-.P
-While it is not necessary to fully understand the POV-Ray application
-in order to make good use of KPovModeler, it is highly recommended
-that you read and try to understand the POV-Ray documentation. 
-.P
-To find out more about POV-Ray go to www.povray.org.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File to open
-.SH OPTIONS
-.TP
-\fB\-\-no\-opengl\fR
-Disables OpenGL rendering
-.SH "SEE ALSO"
-The full documentation for
-.B Povray Modeler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kpovmodeler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPovModeler was written by
-.nh
-Andreas Zehender <zehender@kde.org>,
-Luis Passos Carvalho <lpassos@mail.telepac.pt>,
-Philippe Van Hecke <lephiloux@tiscalinet.be> and
-.hy
-Leonardo Skorianez <skorianez@bol.com.br>.
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kruler.1 b/ubuntu/_base/core/tdegraphics/debian/man/kruler.1
deleted file mode 100644
index 9e32021cd..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kruler.1
+++ /dev/null
@@ -1,81 +0,0 @@
-.TH KRULER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kruler \- TDE Screen Ruler
-.SH SYNOPSIS
-.B kruler
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KRuler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KRuler
-is a very simple application, with only one aim in life. To
-measure distances on your screen. 
-.P
-To start KRuler, choose Graphics->TDE Screen Ruler from your T menu.
-.P
-left mouse button clicking on the KRuler will turn the cursor into a
-hand icon, and enable you to drag KRuler around the screen. 
-.P
-When you move the mouse over KRuler, your cursor will turn into an
-elongated arrow, with a circle at one end. As you move the cursor,
-KRuler will display how far from the point marked 0 the circle on the
-end of the cursor currently is. KRuler will also display the HTML
-color code of the color currently under the circle. This is very
-useful for picking out colors from an image. If you move the mouse far
-enough that the arrow cursor is no longer touching KRuler, the cursor
-will revert to normal, allowing you to carry on working with your
-other applications. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KRuler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kruler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDE Screen Ruler was written by
-.nh
-Till Krech <till@snafu.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1 b/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1
deleted file mode 100644
index 250ca0ef6..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH KSNAPSHOT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-ksnapshot \- TDE Screen Capture Program
-.SH SYNOPSIS
-.B ksnapshot
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KSnapshot
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KSnapshot
-is a simple applet for taking screenshots. It is capable of
-capturing images of either the whole desktop or just a single
-window. The images can then be saved in a variety of formats. 
-.PP
-TDE Screenshot utility
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KSnapshot
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/ksnapshot
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KSnapshot was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Matthias Ettrich <ettrich@kde.org> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1 b/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1
deleted file mode 100644
index bf5caf30c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kuickshow \- TDE Image Viewer
-.SH SYNOPSIS
-.B kuickshow
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kuickshow
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KuickShow
-is a comfortable image browser/viewer. It displays a
-filebrowser where you can select images which are then shown.
-.P
-The following image formats are supported:
-.P
-.RS 
-\(bu jpg
-.br
-\(bu gif
-.br
-\(bu tiff
-.br
-\(bu png
-.br
-\(bu bmp
-.br
-\(bu psd
-.br
-\(bu xmp
-.br
-\(bu xbm
-.br
-\(bu eim
-.RE
-.P
-Images can be displayed either in their own window, as large as the
-image, or fullscreen. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-lastdir\fR
-Start in the last visited directory, not the current working directory
-.SS "Arguments:"
-.TP
-files
-Optional image filenames/urls to show
-.SH "SEE ALSO"
-The full documentation for
-.B Kuickshow
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kuickshow
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KuickShow was written by
-.nh
-Carsten Pfeiffer <pfeiffer@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kview.1
deleted file mode 100644
index 64a2b6928..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kview.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.TH KVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kview \- TDE Image Viewer
-.SH SYNOPSIS
-.B kview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KView
-is an image viewer for the Trinity desktop. You can view graphics of
-many different formats such as PostScript, TIFF etc. By saving your
-files in a different format than the original you can easily convert
-images to other graphics formats. In addition, KView provides some
-nice little features for doing simple image processing, like
-stretching/shrinking, rotation and filtering. You can tile your images
-directly onto the desktop as a background picture, or arrange them in
-a little slideshow. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Image to open
-.SH "SEE ALSO"
-The full documentation for
-.B KView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KView was written by
-.nh
-Matthias Kretz <kretz@kde.org>,
-Sirtaj Singh Kang <taj@kde.org>
-and Simon Hausmann <hausmann@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1 b/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1
deleted file mode 100644
index 83d0e24da..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KVIEWSHELL "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kviewshell \- Generic framework for viewer applications
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kviewshell
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Generic framework for viewer applications.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand,
-and Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1 b/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1
deleted file mode 100644
index 70bcb510a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-tdeiconedit \- TDE Icon Editor
-.SH SYNOPSIS
-.B tdeiconedit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for TDE using the standard
-icon palette.  
-.PP
-TDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/tdeiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules
index d29cd5566..05176711a 100755
--- a/ubuntu/_base/core/tdegraphics/debian/rules
+++ b/ubuntu/_base/core/tdegraphics/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -26,9 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdegraphics-trinity-dbg
 
@@ -46,54 +43,3 @@ binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
 	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-binary-post-install/kpdf-trinity::
-	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
-
-binary-post-install/kghostview-trinity::
-	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
-
-binary-post-install/kcolorchooser-trinity::
-	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
-
-binary-post-install/kdvi-trinity::
-	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
-
-binary-post-install/kfaxview-trinity::
-	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
-
-binary-post-install/tdeiconedit-trinity::
-	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
-
-binary-post-install/kooka-trinity::
-	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
-
-binary-post-install/kpovmodeler-trinity::
-	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
-
-binary-post-install/ksnapshot-trinity::
-	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
-
-binary-post-install/kview-trinity::
-	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
-
-binary-post-install/kcoloredit-trinity::
-	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
-
-binary-post-install/kfax-trinity::
-	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
-
-binary-post-install/kolourpaint-trinity::
-	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
-
-binary-post-install/kruler-trinity::
-	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
-
-binary-post-install/kuickshow-trinity::
-	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
-
-binary-post-install/kviewshell-trinity::
-	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index b7c990473..a0c4a167d 100644
--- a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -193,4 +193,4 @@ debian/tmp/opt/trinity/lib/libksvg.so
 debian/tmp/opt/trinity/lib/libtext2path.la
 debian/tmp/opt/trinity/lib/libtext2path.so
 
-debian/tmp/opt/trinity/share/cmake
+debian/tmp/opt/trinity/share/cmake/kviewshell.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
index cb2ca7535..45e92ea19 100644
--- a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/man/man1/tdeiconedit.1
 
 debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
deleted file mode 100644
index e975ab6b6..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdeiconedit.1
diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/versions.pl b/ubuntu/_base/core/tdelibs/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdelibs/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdelibs/debian/compat b/ubuntu/_base/core/tdelibs/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdelibs/debian/compat
+++ b/ubuntu/_base/core/tdelibs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index 6cf2eb867..1fe02d0ba 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -4,22 +4,22 @@ 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>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils,
  binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man,
  libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
  libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
  liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
- libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev,
  libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
- libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
+ libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
- texinfo, libogg-dev, libtqtinterface-dev,
+ texinfo, libogg-dev, libtqt3-mt-dev,
  lsb-release, base-files, sudo, libr-dev,
- libudev-dev, libltdl-dev, libmagic-dev, libpcsclite-dev,
+ libudev-dev, libltdl-dev, libmagic-dev, libnm-dev, libpcsclite-dev,
  opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
 Package: tdelibs-trinity
@@ -28,8 +28,7 @@ Architecture: all
 Replaces: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
 Provides: tdelibs
-Conflicts: tdelibs
-Depends: tdelibs14-trinity (>= ${source:Version}),
+Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}),
  tdelibs-data-trinity (>= ${source:Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +45,7 @@ Section: libs
 Architecture: all
 Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
+Conflicts: kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
@@ -67,6 +66,7 @@ Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
 Recommends: hwdata, xdg-user-dirs, systemd | elogind | consolekit
 Suggests: fam, perl-suid
+Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
 Description: core libraries and binaries for all TDE applications
  This package contains all the shared libraries and common core binaries
  used by all TDE applications. You need these libraries and binaries to
@@ -103,11 +103,11 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev,
  libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre2-dev,
  liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
  libsasl2-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
- libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-dev,
+ libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqt3-mt-dev,
  libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev
 Recommends: libcupsys2-dev | libcups2-dev
 Provides: tdelibs-trinity-dev
@@ -140,7 +140,7 @@ Replaces: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~)
 Breaks: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~)
 Priority: extra
 Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs14-trinity (= ${source:Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Depends: tdelibs14-trinity (= ${source:Version}), libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules
index eafe84957..8ac64a31b 100755
--- a/ubuntu/_base/core/tdelibs/debian/rules
+++ b/ubuntu/_base/core/tdelibs/debian/rules
@@ -10,8 +10,15 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= t64
+else
+DEB_TIME64_SUFFIX	=
+endif
+
 
 DEB_KDE_APIDOX := yes
 
@@ -32,6 +39,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_LIBART="ON" \
  -DWITH_LIBIDN="ON" \
  -DWITH_TIFF="ON" \
+ -DWITH_WEBP="ON" \
  -DWITH_JASPER="ON" \
  -DWITH_OPENEXR="ON" \
  -DWITH_AVAHI="ON" \
@@ -101,7 +109,52 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
-binary-install/tdelibs14-trinity::
+binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/tdelibs14-trinity\." | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \
+	done
+	sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \
+	    -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/tdelibs14$(DEB_TIME64_SUFFIX)-trinity\." | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \
+	    -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index 92a201781..965adf1ea 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1748,7 +1748,9 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V3
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
+debian/tmp/opt/trinity/share/apps/LICENSES/MIT
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
+debian/tmp/opt/trinity/share/apps/tdemarkdown
 debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
@@ -1762,6 +1764,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_bottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_mid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_top.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png
@@ -1778,30 +1783,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/flat.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/print.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tabs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-trinity.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
@@ -1905,6 +1919,7 @@ debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/opt/trinity/share/services/kxzfilter.desktop
+debian/tmp/opt/trinity/share/services/markdown_part.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
@@ -1929,6 +1944,7 @@ debian/tmp/opt/trinity/share/services/tga.kimgio
 debian/tmp/opt/trinity/share/services/tiff.kimgio
 debian/tmp/opt/trinity/share/services/webdav.protocol
 debian/tmp/opt/trinity/share/services/webdavs.protocol
+debian/tmp/opt/trinity/share/services/webp.kimgio
 debian/tmp/opt/trinity/share/services/xbm.kimgio
 debian/tmp/opt/trinity/share/services/xcf.kimgio
 debian/tmp/opt/trinity/share/services/xpm.kimgio
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
index f2a8d925b..99078621c 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
 case "$1" in
 
 	upgrade|install)
-	ldconfig
 	;;
 
 	abort-upgrade)
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
index aae9f3600..40c135b0c 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
 case "$1" in
 
 	remove)
-	ldconfig
 	;;
 
 	abort-upgrade)
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
index 949783b12..301b290e0 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -120,7 +120,6 @@ debian/tmp/opt/trinity/include/tdeactionshortcutlist.h
 debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
-debian/tmp/opt/trinity/include/kapp.h
 debian/tmp/opt/trinity/include/tdeapplication.h
 debian/tmp/opt/trinity/include/karchive.h
 debian/tmp/opt/trinity/include/kar.h
@@ -183,7 +182,7 @@ debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h
 debian/tmp/opt/trinity/include/tdeconfig.h
 debian/tmp/opt/trinity/include/tdeconfigskeleton.h
 debian/tmp/opt/trinity/include/kcpuinfo.h
-debian/tmp/opt/trinity/include/kcrash.h
+debian/tmp/opt/trinity/include/tdecrash.h
 debian/tmp/opt/trinity/include/kcursor.h
 debian/tmp/opt/trinity/include/kcustommenueditor.h
 debian/tmp/opt/trinity/include/kdatagramsocket.h
@@ -218,8 +217,8 @@ debian/tmp/opt/trinity/include/tderootsystemdevice.h
 debian/tmp/opt/trinity/include/tdesensordevice.h
 debian/tmp/opt/trinity/include/tdestoragedevice.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
-debian/tmp/opt/trinity/include/kdemacros.h
 debian/tmp/opt/trinity/include/tde.pot
+debian/tmp/opt/trinity/include/tdemacros.h
 debian/tmp/opt/trinity/include/tdeprint/driver.h
 debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
 debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@@ -237,7 +236,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h
 debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h
 debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h
 debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h
-debian/tmp/opt/trinity/include/kdesktopfile.h
+debian/tmp/opt/trinity/include/tdedesktopfile.h
 debian/tmp/opt/trinity/include/tdesu/client.h
 debian/tmp/opt/trinity/include/tdesu/defaults.h
 debian/tmp/opt/trinity/include/tdesu/kcookie.h
@@ -295,7 +294,7 @@ debian/tmp/opt/trinity/include/tdefontdialog.h
 debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
-debian/tmp/opt/trinity/include/kglobalaccel.h
+debian/tmp/opt/trinity/include/tdeglobalaccel.h
 debian/tmp/opt/trinity/include/tdeglobal.h
 debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
@@ -325,7 +324,7 @@ debian/tmp/opt/trinity/include/kimiface.h
 debian/tmp/opt/trinity/include/tdeimproxy.h
 debian/tmp/opt/trinity/include/tdeimproxyiface.h
 debian/tmp/opt/trinity/include/kinputdialog.h
-debian/tmp/opt/trinity/include/kinstance.h
+debian/tmp/opt/trinity/include/tdeinstance.h
 debian/tmp/opt/trinity/include/tdeio/authinfo.h
 debian/tmp/opt/trinity/include/tdeiobuffer.h
 debian/tmp/opt/trinity/include/tdeio/chmodjob.h
@@ -486,9 +485,9 @@ debian/tmp/opt/trinity/include/tdepopupmenu.h
 debian/tmp/opt/trinity/include/kpreviewwidgetbase.h
 debian/tmp/opt/trinity/include/kprintaction.h
 debian/tmp/opt/trinity/include/kprinter.h
-debian/tmp/opt/trinity/include/kprocctrl.h
-debian/tmp/opt/trinity/include/kprocess.h
-debian/tmp/opt/trinity/include/kprocio.h
+debian/tmp/opt/trinity/include/tdeprocctrl.h
+debian/tmp/opt/trinity/include/tdeprocess.h
+debian/tmp/opt/trinity/include/tdeprocio.h
 debian/tmp/opt/trinity/include/kprogress.h
 debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
@@ -547,7 +546,7 @@ debian/tmp/opt/trinity/include/tdeshortcutdialog.h
 debian/tmp/opt/trinity/include/tdeshortcut.h
 debian/tmp/opt/trinity/include/tdeshortcutlist.h
 debian/tmp/opt/trinity/include/kshred.h
-debian/tmp/opt/trinity/include/ksimpleconfig.h
+debian/tmp/opt/trinity/include/tdesimpleconfig.h
 debian/tmp/opt/trinity/include/ksmimecrypto.h
 debian/tmp/opt/trinity/include/ksockaddr.h
 debian/tmp/opt/trinity/include/tdesocketaddress.h
@@ -595,13 +594,12 @@ debian/tmp/opt/trinity/include/ksslsigners.h
 debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
-debian/tmp/opt/trinity/include/kstandarddirs.h
+debian/tmp/opt/trinity/include/tdestandarddirs.h
 debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
 debian/tmp/opt/trinity/include/kstdaction.h
-debian/tmp/opt/trinity/include/kstddirs.h
 debian/tmp/opt/trinity/include/kstdguiitem.h
 debian/tmp/opt/trinity/include/kstreamsocket.h
 debian/tmp/opt/trinity/include/kstringhandler.h
@@ -665,8 +663,7 @@ debian/tmp/opt/trinity/include/tdetoolbarlabelaction.h
 debian/tmp/opt/trinity/include/tdetoolbarradiogroup.h
 debian/tmp/opt/trinity/include/ktrader.h
 debian/tmp/opt/trinity/include/ktypelist.h
-debian/tmp/opt/trinity/include/kuniqueapp.h
-debian/tmp/opt/trinity/include/kuniqueapplication.h
+debian/tmp/opt/trinity/include/tdeuniqueapplication.h
 debian/tmp/opt/trinity/include/tdeunittest/module.h
 debian/tmp/opt/trinity/include/tdeunittest/runner.h
 debian/tmp/opt/trinity/include/tdeunittest/tester.h
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
index 14cca82e2..f71e37af6 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -139,6 +139,8 @@ debian/tmp/opt/trinity/lib/trinity/kimg_tga.la
 debian/tmp/opt/trinity/lib/trinity/kimg_tga.so
 debian/tmp/opt/trinity/lib/trinity/kimg_tiff.la
 debian/tmp/opt/trinity/lib/trinity/kimg_tiff.so
+debian/tmp/opt/trinity/lib/trinity/kimg_webp.la
+debian/tmp/opt/trinity/lib/trinity/kimg_webp.so
 debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la
 debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so
 debian/tmp/opt/trinity/lib/trinity/kimg_xview.la
@@ -195,6 +197,8 @@ debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.la
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.so
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/_base/core/tdemultimedia/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdemultimedia/debian/compat b/ubuntu/_base/core/tdemultimedia/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/compat
+++ b/ubuntu/_base/core/tdemultimedia/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdemultimedia/debian/control b/ubuntu/_base/core/tdemultimedia/debian/control
index 7ae0e8b3b..29bf0c13b 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/control
+++ b/ubuntu/_base/core/tdemultimedia/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>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
diff --git a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
index b3b2e7b91..6612af4b0 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/juk.png
+debian/tmp/opt/trinity/share/man/man1/juk.1
 
 debian/icons/juk.xpm		/opt/trinity/share/pixmaps
 debian/icons/juk-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages
deleted file mode 100644
index cc1b91a74..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/juk-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
index e16be8952..e7650b74f 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/opt/trinity/share/man/man1/kaboodle.1
 debian/tmp/opt/trinity/share/services/kaboodle_component.desktop
 debian/tmp/opt/trinity/share/services/kaboodleengine.desktop
 
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
deleted file mode 100644
index 56aa78551..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaboodle-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
index 4569bbf20..411add448 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -35,6 +35,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kaudiocreator.png
+debian/tmp/opt/trinity/share/man/man1/kaudiocreator.1
 
 debian/icons/kaudiocreator.xpm		/opt/trinity/share/pixmaps
 debian/icons/kaudiocreator-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
deleted file mode 100644
index e3f09d6dd..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaudiocreator-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
index fd8ea15e1..4ee39eb84 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
@@ -12,29 +12,10 @@ debian/tmp/opt/trinity/share/applications/tde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
 debian/tmp/opt/trinity/share/apps/kmix/pics/Listener.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_error.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_mute.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ac97.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_audio.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_bass.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_cd.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_digital.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ext.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_headphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_microphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_midi.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_recmon.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_record.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_surround.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_treble.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/Speaker*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/mix*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/crystal/*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/oldcrystal/*.png
 debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop
 debian/tmp/opt/trinity/share/autostart/kmix.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common
@@ -48,6 +29,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/opt/trinity/share/man/man1/kmix.1
+debian/tmp/opt/trinity/share/man/man1/kmixctrl.1
 debian/tmp/opt/trinity/share/services/kmixctrl_restore.desktop
 
 debian/icons/kmix.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
index c802a5b07..914623090 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,2 @@
 kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
 kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages
deleted file mode 100644
index e0adce8b6..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kmix-trinity.1
-debian/man/kmixctrl-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
index 40832458b..19db44587 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/opt/trinity/share/man/man1/krec.1
 debian/tmp/opt/trinity/share/services/kcm_krec.desktop
 debian/tmp/opt/trinity/share/services/kcm_krec_files.desktop
 debian/tmp/opt/trinity/share/services/krec_exportogg.desktop
diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
index 9cba1f36a..e5e13fb57 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1 @@
 krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages
deleted file mode 100644
index 8a59c57a8..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/krec-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1
deleted file mode 100644
index 0981892b5..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH "JuK" "1" "April 2006"
-.SH "NAME"
-juk \- music organizer and player for TDE
-.SH "SYNOPSIS"
-\fBjuk\fR
-.SH "DESCRIPTION"
-.LP 
-
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-.
-.SH "OPTIONS"
-.l
-\fIjuk\fP does not accept any command-line options.
-.
-
-.SH "DCOP"
-
-\fIjuk\fP has a DCOP (Desktop Communications Protocol) interface
-that may be used to start, stop, skip forward to the next song,
-etc.  This may be done from the command line using \fIdcop\fP
-as follows:
-
-.RS
-$ dcop juk Player forward
-
-$ dcop juk Player back
-
-$ dcop juk Player stop
-
-$ dcop juk Player play
-.RE
-
-.SH "AUTHOR"
-This page was written by David Schleef <ds@schleef.org> for Debian,
-but may be used elsewhere.
-
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
deleted file mode 100644
index 72ff225fa..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
+++ /dev/null
@@ -1,261 +0,0 @@
-.lf 1 info/tdemultimedia.kaboodle.1
-.TH KABOODLE 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kaboodle \- TDE simple and lean Media Player
-.SH SYNOPSIS
-.B kaboodle
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kaboodle
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kaboodle
-is a simple KMedia (aRts) player for TDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
-It is meant for simple stuff like playing a quick video or sound file. 
-.B Kaboodle
-does not accept plugins, does not have a playlist or volume control and other such features.
-.P
-To get a media-player with a full-fledged user interface, look at
-.BR noatun (1)
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-URL
-URL of media file to play
-.SS "General Options"
-.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\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdetqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 53 info/tdemultimedia.kaboodle.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 55 info/tdemultimedia.kaboodle.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kaboodlerc
-configuration file.
-.SH AUTHOR
-Kaboodle was written by
-.nh
-.ad l
-Neil Stevens <neil@qualityassistant.com>,
-Nikolas Zimmermann <wildfox@kde.org>,
-and Charles Samuels <charles@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.BR noatun (1)
-.br
-The full documentation for
-.B kaboodle
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kaboodle
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kaboodle
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
deleted file mode 100644
index 35600bcda..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.TH kaudiocreator 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-kaudiocreator \- CD ripper and audio encoder front-end
-.SH SYNOPSIS
-kaudiocreator [Qt-options] [TDE-options] 
-.SH DESCRIPTION
-.B kaudiocreator 
-is the CD ripper and audio encoder front-end for the Trinity Desktop Environment. It
-supports many encoders like 
-.BR lame (1),
-.BR oggenc (1),
-.BR flac (1),
-and performs CDDB queries.
-
-.SH OPTIONS
-.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 title bar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the title bar
-.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 window manager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.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
- 
-
-.SH AUTHOR
-Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
-
-Please use <http://bugs.trinitydesktop.org> to report bugs, do not mail the authors
-directly.
-
-
-This man-page was written by Francois Wendling <frwendling@free.fr>
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1
deleted file mode 100644
index e603facb3..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH KMIX 1 "August, 15 2003"
-.SH NAME
-Kmix \- TDE audio mini-mixer
-.SH SYNOPSIS
-.B kmix 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmix
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBKmix\fP is a mini audio mixer for TDE. It allows the user to change
-volume settings for each sound device (master, CD, line, mic, ...).
-.SH OPTIONS
-A summary of options for Kmix is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-
-.SH SEE ALSO
-.BR kmixctrl (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmix was written by the KDE project.
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
deleted file mode 100644
index 58a586b18..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KMIXCTRL 1 "August, 25 2003"
-.SH NAME
-kmixctrl \- Settings loader/saver for kmix
-.SH SYNOPSIS
-.B kmixctrl 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmixctrl
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
-.SH OPTIONS
-A summary of options for kmixctrl is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-s, \-\-save
-Save the current settings as default
-.TP
-.B \-r, \-\-restore
-Restores the default settings
-
-.SH SEE ALSO
-.BR kmix (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmixctrl was written by the KDE project.
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1
deleted file mode 100644
index 9e2c57e3c..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH krec "1" "July 2004" "Debian" "User Commands"
-.SH NAME
-krec \- A voice recording program
-.SH SYNOPSIS
-.B krec
-[\fIoptions\fR]
-.SH DESCRIPTION
-This is a recording tool for TDE.
-It uses aRts, just look at the audiomanager
-and you will find it there accepting sound
-for recording.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-
-
-.SH USAGE
-Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
-	
-.SH AUTHORS
-krec is (C)2002-2003 By Arnold Krille (arnold@arnoldarts.de)
-.P
-This man page was written and maintained by Ryan Waye (rmw998@gmail.com) 
-.PP
-.
-.
-.SH "STANDARD DISCLAIMER"
-Use only at your own risk!
-There may be errors and inaccuracies that could be damaging to your system or
-your eye.
-Proceed with caution, and although this is highly unlikely, the authors don't
-take any responsibility for that!
-.PP
-
-This document is licensed under the GPL.
-.P
-KDE: 3.2.2
-.P
-KRec: 0.5
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1
deleted file mode 100644
index 1ed42ae02..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH NOATUN 1 "June 2006" "Trinity Desktop Environment" "Media Player"
-.SH NAME
-noatun
-\- fully-featured plugin-based media player for TDE
-.SH SYNOPSIS
-\fBnoatun\fP [Qt\-options] [TDE\-options] [URL] 
-.SH DESCRIPTION
-\fBNoatun\fP is a fully\-featured plugin\-based media player for TDE.
-It is an elaborate front-end to aRts - the Analog Real\-Time Synthesizer.
-By default aRts supports MP3 and MPEG\-1. Vorbis is also supported.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Files/URLs to open
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-To find additional playobjects, go to \fBhttp://noatun.kde.org/plugins.phtml\fP, or \fBhttp://mpeglib.sf.net\fP.
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can enter the URL
-.BR help:/noatun/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/noatun/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Charles Samuels <charles@kde.org>
-.br
-Stefan Westerfeld <stefan@space.twc.de>
-.br
-Martin Vogt <mvogt@rhrk.uni\-kl.de>
-.br
-Malte Starostik <malte@kde.org>
-.br
-Nikolas Zimmermann <wildfox@kde.org>
-.br
-Stefan Schimanski <1Stein@gmx.de>
-.br
-Stefan Gehn <metz@gehn.net>
-.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/tdemultimedia/debian/noatun-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
index e5adf0383..407d649f1 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
@@ -323,6 +323,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/opt/trinity/share/man/man1/noatun.1
 debian/tmp/opt/trinity/share/mimelnk/interface/x-winamp-skin.desktop
 
 debian/icons/noatun.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages
deleted file mode 100644
index e5196f799..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/noatun-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/rules b/ubuntu/_base/core/tdemultimedia/debian/rules
index ea08bafa0..8d4a580e7 100755
--- a/ubuntu/_base/core/tdemultimedia/debian/rules
+++ b/ubuntu/_base/core/tdemultimedia/debian/rules
@@ -1,8 +1,7 @@
 #! /usr/bin/make -f
 
-include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
index 13381df12..ad63bce71 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
@@ -8,6 +8,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_m3u.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_mp3.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp4.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_mp4.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_mpc.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_mpeg.la
@@ -25,6 +27,7 @@ debian/tmp/opt/trinity/share/services/tdefile_avi.desktop
 debian/tmp/opt/trinity/share/services/tdefile_flac.desktop
 debian/tmp/opt/trinity/share/services/tdefile_m3u.desktop
 debian/tmp/opt/trinity/share/services/tdefile_mp3.desktop
+debian/tmp/opt/trinity/share/services/tdefile_mp4.desktop
 debian/tmp/opt/trinity/share/services/tdefile_mpc.desktop
 debian/tmp/opt/trinity/share/services/tdefile_mpeg.desktop
 debian/tmp/opt/trinity/share/services/tdefile_ogg.desktop
diff --git a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdenetwork/debian/cdbs/versions.pl b/ubuntu/_base/core/tdenetwork/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdenetwork/debian/compat b/ubuntu/_base/core/tdenetwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdenetwork/debian/compat
+++ b/ubuntu/_base/core/tdenetwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdenetwork/debian/control b/ubuntu/_base/core/tdenetwork/debian/control
index a5ff721d6..df2b50ffa 100644
--- a/ubuntu/_base/core/tdenetwork/debian/control
+++ b/ubuntu/_base/core/tdenetwork/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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
index 7d57f12cf..8712a1ebd 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
@@ -24,6 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdict.svgz
+debian/tmp/opt/trinity/share/man/man1/kdict.1
 
 debian/icons/kdict-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kdict.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages
deleted file mode 100644
index 3128a0e9a..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdict-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst
deleted file mode 100644
index 5076ff321..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kdict-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
index d2a0707c9..623f76912 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
@@ -73,6 +73,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kget_list.png
+debian/tmp/opt/trinity/share/man/man1/kget.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-kgetlist.desktop
 debian/tmp/opt/trinity/share/sounds/KGet_Added.ogg
 debian/tmp/opt/trinity/share/sounds/KGet_Finished.ogg
diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages
deleted file mode 100644
index 585b03129..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kget-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
index 48f843209..8ac850cbf 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
@@ -474,6 +474,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/jabber_protocol.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kopete2.svgz
+debian/tmp/opt/trinity/share/man/man1/kopete.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-icq.desktop
 debian/tmp/opt/trinity/share/mimelnk/application/x-kopete-emoticons.desktop
 debian/tmp/opt/trinity/share/services/aim.protocol
diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages
deleted file mode 100644
index 214a24d2e..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kopete-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/krdc-trinity.install b/ubuntu/_base/core/tdenetwork/debian/krdc-trinity.install
index c98bcd373..911bfd91c 100644
--- a/ubuntu/_base/core/tdenetwork/debian/krdc-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/krdc-trinity.install
@@ -5,8 +5,6 @@ debian/tmp/opt/trinity/share/apps/krdc/pics/close.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/iconify.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/pindown.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/pinup.png
-debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursor.png
-debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursormask.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/authentication.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/close.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/common
diff --git a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian
index f219b1176..6cd864e57 100644
--- a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1 @@
 ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst
deleted file mode 100644
index 1ee118baa..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for ksirc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
index 328c9ae44..f4eb51a58 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
@@ -29,6 +29,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwifimanager.svgz
+debian/tmp/opt/trinity/share/man/man1/kwifimanager.1
 
 debian/icons/kwifimanager-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kwifimanager.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..f85b1021c 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1 @@
 kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
deleted file mode 100644
index 4f390510b..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kwifimanager-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
index 728eed390..47ab05c03 100644
--- a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
@@ -15,6 +15,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.docbook
+debian/tmp/opt/trinity/share/man/man8/lisa.8
+debian/tmp/opt/trinity/share/man/man8/reslisa.8
 debian/tmp/opt/trinity/share/services/lan.protocol
 debian/tmp/opt/trinity/share/services/rlan.protocol
 
diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages
deleted file mode 100644
index 306f0c52e..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/lisa-trinity.8
-debian/man/reslisa-trinity.8
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1
deleted file mode 100644
index aff5138c4..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client"
-.SH NAME
-kdict
-\- The TDE Dictionary Client
-.SH SYNOPSIS
-\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] 
-.SH DESCRIPTION
-\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return.
-.sp 1
-The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries.
-.sp 1
-\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor.
-.sp 1
-If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice.
-.SH OPTIONS
-.SS
-.SS Arguments:
-word/phrase               Lookup the given word/phrase
-.SS Options:
-.TP
-.B \-c,  \-\-clipboard  
-Define X11-clipboard content (selected text)
-.SS 
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-.SH FILES
-.I ~/.trinity/share/config/kdictrc
-.br
-.I ~/.trinity/share/config/kdict_panelappletrc
-.RS
-\fBkdict\fP configuration files
-.SH SEE ALSO
-.TP
-\fBwww.dict.org\fP
-DICT Development Group home page
-.RE
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdict/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdict/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Christian Gebauer <gebauer@kde.org>
-.br
-Matthias Hoelzer <hoelzer@kde.org>
-.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/tdenetwork/debian/man/kget-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1
deleted file mode 100644
index 72b2d3305..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager"
-.SH NAME
-kget
-\- An advanced download manager for TDE
-.SH SYNOPSIS
-\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] 
-.SH DESCRIPTION
-\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed.
-.sp 1
-To download a document or package, drag and drop the URL on to \fBKGet\fP.
-.SH OPTIONS
-.SS
-.SS Arguments:
-URL(s)                    URL(s) to download
-.SS Options:
-.TP
-.B  \-\-showDropTarget  
-Start KGet with drop target
-.SS 
-.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 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 
-.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
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kget/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kget/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matej Moss
-.br
-Patrick  Charbonnier <pch@freeshell.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.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/tdenetwork/debian/man/kopete-trinity.sgml b/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
deleted file mode 100644
index 87922999d..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-  -->
-
-  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-  <!ENTITY dhsurname   "<surname>Stone</surname>">
-  <!ENTITY dhdate      "<date>April 20, 2002</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>dstone@kde.org</email>">
-  <!ENTITY dhusername  "Daniel Stone">
-  <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>">
-  <!ENTITY dhpackage   "kopete">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>A TDE-based Instant Messaging client.</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-tde<replaceable></replaceable></option></arg>
-      <arg><option>--help-qt<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable> -v</replaceable></option></arg>
-      <arg><option>--license<replaceable></replaceable</option></arg>
-      <arg><option>--author<replaceable></replaceable></option></arg>
-      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--cmap<replaceable></replaceable></option></arg>
-      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nograb<replaceable></replaceable></option></arg>
-      <arg><option>--dograb<replaceable></replaceable></option></arg>
-      <arg><option>--sync<replaceable></replaceable></option></arg>
-      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
-      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
-      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
-      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
-      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
-      <arg><option>--noxim<replaceable></replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant
-    Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below. However, the ordering is very strict -
-      --help/-h must come before hostname.</para>
-    <variablelist>
-      <varlistentry>
-        <term><option>-v</option>
-	  <option>--version</option>
-	</term>
-	<listitem>
-	  <para>Show version information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--author</option>
-	</term>
-	<listitem>
-	  <para>Show information about the author.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--license</option>
-	</term>
-	<listitem>
-	  <para>Show license information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--caption &lt;caption&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the caption of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--icon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--miniicon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the mini-icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dcopserver &lt;server&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the DCOP server to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nocrashhandler</option>
-	</term>
-	<listitem>
-	  <para>Disable TDE crash handler (enables core dumps).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--waitforwm</option>
-	</term>
-	<listitem>
-	  <para>Waits for a compatible window manager to start.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--style &lt;style&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the application's GUI style (overrides TDE).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--geometry &lt;geometry&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the geometry of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--display &lt;display&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specifies the X display to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--session &lt;sessionid&gt;</option>
-	</term>
-	<listitem>
-	  <para>Restores the application for the given session ID.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cmap</option>
-	</term>
-	<listitem>
-	  <para>Forces use of an internal colour map on an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--ncols &lt;count&gt;</option>
-	</term>
-	<listitem>
-	  <para>Limits the number of colours allowed in an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nograb</option>
-	</term>
-	<listitem>
-	  <para>Forces Qt to never grab the mouse or keyboard.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dograb</option>
-	</term>
-	<listitem>
-	  <para>Overrides --nograb, which may be implicitly set.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--sync</option>
-	</term>
-	<listitem>
-	  <para>Forces synchronous mode (for debugging).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--font &lt;font&gt;</option>
-	  <option>--fn &lt;font&gt;</option></term>
-	<listitem>
-	  <para>Sets the default application font.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--background &lt;colour&gt;</option>
-	  <option>--bg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default background colour and application
-	  pallette.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--foreground &lt;colour&gt;</option>
-	  <option>--fg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default foreground colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--button &lt;colour&gt;</option>
-	  <option>--btn &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default button colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--name &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application name.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--title &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application title.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--visual TrueColor</option>
-	  </term>
-	<listitem>
-	  <para>Forces the application to use a True Colour visual on 8-bit
-	  displays.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--inputstyle &lt;style&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) input style. Possible values are: 
-	  onthespot, overthespot, offthespot, and root.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--im &lt;server&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) server.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--noxim</option>
-	  </term>
-	<listitem>
-	  <para>Disables X Input Method (XIM) support.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> General Public License
-      version 2 or any later version published by the Free Software Foundation.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
deleted file mode 100644
index 5f12be561..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands"
-.SH NAME
-kwifimanager \- manual page for kwifimanager
-.SH SYNOPSIS
-.B kwifimanager
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-\fBkwifimanager\fR is a TDE wireless management program.
-.SH GENERIC OPTIONS:
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show QT specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR,  \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.SH QT OPTIONS:
-.TP
-\fB\-\-display <displayname>\fR
-Use the X-server display 'displayname'
-.TP
-\fB\-\-session <sessionId>\fR
-Restore the application for the given 'sessionId'
-.TP
-\fB\-\-cmap\fR
-Causes the application to install a private color map on an 8-bit display
-.TP
-\fB\-\-ncols <count>\fR
-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
-\fB\-\-nograb\fR
-Tells Qt to never grab the mouse or the keyboard
-.TP
-\fB\-\-dograb\fR
-Running under a debugger can cause an implicit -nograb, use -dograb to override
-.TP
-\fB\-\-sync\fR
-Switches to synchronous mode for debugging
-.TP
-\fB\-\-fn, \-\-font <fontname>\fR
-Defines the application font
-.TP
-\fB\-\-bg, \-\-background <color>\fR
-Sets the default background color and an application palette (light and dark shades are calculated)
-.TP
-\fB\-\-fg, \-\-foreground <color>\fR
-Sets the default foreground color
-.TP
-\fB\-\-btn, \-\-button <color>\fR
-Sets the default button color
-.TP
-\fB\-\-name <name>\fR
-Sets the application name
-.TP
-\fB\-\-title <title>\fR
-Sets the application title (caption)
-.TP
-\fB\-\-visual TrueColor\fR
-Forces the application to use a TrueColor visual on an 8-bit display
-.TP
-\fB\-\-inputstyle <inputstyle>\fR
-Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root
-.TP
-\fB\-\-im <XIM server>\fR
-Set XIM server
-.TP
-\fB\-\-noxim\fR
-Disable XIM
-.TP
-\fB\-\-reverse\fR
-Mirrors the whole layout of widgets
-.SH TDE OPTIONS:
-.TP
-\fB\-\-caption <caption>\fR
-Use 'caption' as name in the titlebar
-.TP
-\fB\-\-icon <icon>\fR
-Use 'icon' as the application icon
-.TP
-\fB\-\-miniicon <icon>\fR
-Use 'icon' as the icon in the titlebar
-.TP
-\fB\-\-config <filename>\fR
-Use alternative configuration file
-.TP
-\fB\-\-dcopserver <server>\fR
-Use the DCOP Server specified by 'server'
-.TP
-\fB\-\-nocrashhandler\fR
-Disable crash handler, to get core dumps
-.TP
-\fB\-\-waitforwm\fR
-Waits for a WM_NET compatible windowmanager
-.TP
-\fB\-\-style <style>\fR
-Sets the application GUI style
-.TP
-\fB\-\-geometry <geometry>\fR
-Sets the client geometry of the main widget - see man X for the argument format
-.SH AUTHOR
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-This manual page was written by Chris Bier <chris.bier@cymor.com>.
-Based on the xchat man page written by Davide Puricelli <evo@debian.org>,
-and the kwifimanager help options.  It was written for the Debian GNU/Linux
-system (but may be used by others).
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8
deleted file mode 100644
index 9b3192e14..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8
+++ /dev/null
@@ -1,77 +0,0 @@
-.TH "lisa" "8" "December 2005" 
-
-.SH "NAME" 
-lisa \-  LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B lisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B lisa
-command. 
-.PP
-.B lisa
-is intended to provide a kind of "network neighbourhood" but only relaying on
-the TCP/IP protocol stack, no smb or whatever. The list of running hosts is
-provided via TCP port 7741.
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.lisarc and /etc/lisarc. 
-.TP
-.BI "\-p, \-\-port" " PORTNR"
-Start the server on the portnumber
-.IR PORTNR .
-If you use this, LISa won't be able to
-cooperate with other LISa's in the network.
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBlisa\fR, it will reread its
-configuration file (killall -HUP lisa).
-.PP
-If you send the User1-Signal to \fBlisa\fR, it will print some status
-information to the standard output (killall -USR1 lisa). You won't see 
-anything if the console from which \fBlisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR reslisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. You can
-redistribute it and/or modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version. 
-
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8
deleted file mode 100644
index eb2ca8f48..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8
+++ /dev/null
@@ -1,72 +0,0 @@
-.TH "reslisa" "8" "December 2005" 
-
-.SH "NAME" 
-reslisa \-  Restricted LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B reslisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B reslisa
-command. 
-.PP
-If you have very strict security rules in your network or you don't want to
-have another port open or whatever, you can use 
-.B resLISa
-instead of
-.BR lisa (1).
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.reslisarc and /etc/reslisarc. 
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBreslisa\fR, it will reread its
-configuration file (killall -HUP reslisa).
-.PP
-If you send the User1-Signal to \fBreslisa\fR, it will print some status
-information to the standard output (killall -USR1 reslisa). You won't see 
-anything if the console from which \fBreslisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR lisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. You can
-redistribute it and/or modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version. 
-
diff --git a/ubuntu/_base/core/tdenetwork/debian/rules b/ubuntu/_base/core/tdenetwork/debian/rules
index 2b391197b..33c4b9bf2 100755
--- a/ubuntu/_base/core/tdenetwork/debian/rules
+++ b/ubuntu/_base/core/tdenetwork/debian/rules
@@ -12,8 +12,7 @@ endif
 export DH_OPTIONS
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
index 46b3c424c..54cb2ca36 100644
--- a/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
@@ -2,13 +2,14 @@ debian/tmp/opt/trinity/share/services/zeroconf.protocol
 debian/tmp/opt/trinity/share/services/invitation.protocol
 debian/tmp/opt/trinity/share/services/kded/dnssdwatcher.desktop
 debian/tmp/opt/trinity/share/apps/remoteview/zeroconf.desktop
-debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_ftp._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_ldap._tcp
-debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_nfs._tcp
-debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_rfb._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_sftp-ssh._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
 debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.la
 debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.so
diff --git a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdepim/debian/cdbs/versions.pl b/ubuntu/_base/core/tdepim/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdepim/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdepim/debian/compat b/ubuntu/_base/core/tdepim/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdepim/debian/compat
+++ b/ubuntu/_base/core/tdepim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control
index c85222c1d..d0e30c5e1 100644
--- a/ubuntu/_base/core/tdepim/debian/control
+++ b/ubuntu/_base/core/tdepim/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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  tdelibs14-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libogg-dev,
  libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
@@ -12,7 +12,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
  libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
  libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: libkleopatra0-trinity-dev
 Standards-Version: 3.8.4
 
@@ -21,7 +21,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
 Breaks: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
-Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version})
+Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}) | libkleopatra1t64-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) | libmimelib1t64-trinity (>= ${source:Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
diff --git a/ubuntu/_base/core/tdepim/debian/libkleopatra1-trinity.install b/ubuntu/_base/core/tdepim/debian/libkleopatra1-trinity.install
index ec394bea0..285531a57 100644
--- a/ubuntu/_base/core/tdepim/debian/libkleopatra1-trinity.install
+++ b/ubuntu/_base/core/tdepim/debian/libkleopatra1-trinity.install
@@ -1,12 +1,8 @@
 /etc/trinity/libkleopatrarc
-/opt/trinity/lib/libgpgme++.so.0
-/opt/trinity/lib/libgpgme++.so.0.4.0
-/opt/trinity/lib/libkleopatra.so.1
-/opt/trinity/lib/libkleopatra.so.1.0.0
-/opt/trinity/lib/libkpgp.so.2
-/opt/trinity/lib/libkpgp.so.2.2.0
-/opt/trinity/lib/libqgpgme.so.0
-/opt/trinity/lib/libqgpgme.so.0.0.0
+/opt/trinity/lib/libgpgme++.so.*
+/opt/trinity/lib/libkleopatra.so.*
+/opt/trinity/lib/libkpgp.so.*
+/opt/trinity/lib/libqgpgme.so.*
 /opt/trinity/share/apps/tdeconf_update/kpgp-3.1-upgrade-address-data.pl
 /opt/trinity/share/apps/tdeconf_update/kpgp.upd
 /opt/trinity/share/apps/libkleopatra
diff --git a/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules
index f2de846ca..58e1d63da 100755
--- a/ubuntu/_base/core/tdepim/debian/rules
+++ b/ubuntu/_base/core/tdepim/debian/rules
@@ -10,8 +10,14 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= t64
+else
+DEB_TIME64_SUFFIX	=
+endif
 
 DEB_KDE_APIDOX := yes
 
@@ -86,3 +92,65 @@ KDE_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\.dfsg.
 KDE_TARBALL := ../$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION).tar.bz2
 KDE_SOURCEDIR := dfsg-tmp/$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION)
 NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libmimelib1c2a" | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libmimelib1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \
+	done
+	ls -d debian/* | \
+	grep -E "/libkleopatra1-" | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libkleopatra1$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    \
+	    -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libkleopatra1\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libmimelib1$(DEB_TIME64_SUFFIX)-" | \
+	xargs -r rm
+	ls -d debian/* | \
+	grep -E "/libkleopatra1$(DEB_TIME64_SUFFIX)-" | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    \
+	    -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libkleopatra1\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdesdk/debian/cdbs/versions.pl b/ubuntu/_base/core/tdesdk/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdesdk/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
index 6759ea297..189c5f2f2 100644
--- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
@@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/
 
 # This is from tdeinit black magic.
 cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
 cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst
deleted file mode 100644
index 800a596bf..000000000
--- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for cervisia-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdesdk/debian/compat b/ubuntu/_base/core/tdesdk/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdesdk/debian/compat
+++ b/ubuntu/_base/core/tdesdk/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control
index b4e0c1eae..e67a3ac97 100644
--- a/ubuntu/_base/core/tdesdk/debian/control
+++ b/ubuntu/_base/core/tdesdk/debian/control
@@ -4,11 +4,11 @@ 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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39),
  tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
  libktnef1-trinity-dev, libsvn-dev, libdb-dev,
- libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
+ libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), dh-python
 Standards-Version: 3.8.4
 
 Package: tdesdk-trinity
@@ -165,7 +165,7 @@ Architecture: all
 Section: devel
 Replaces: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
 Breaks: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, php-cli | php5-cli, python-all
+Depends: ${perl:Depends}, ${python3:Depends}, php-cli | php5-cli
 Recommends: tdecachegrind-trinity
 Description: format converters for TDECachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
@@ -219,7 +219,7 @@ Architecture: all
 Section: devel
 Replaces: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
 Breaks: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python-all
+Depends: ${perl:Depends}, ${python3:Depends}
 Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts
 Enhances: kate-trinity
@@ -360,7 +360,7 @@ Architecture: any
 Section: devel
 Replaces: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~)
 Breaks: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
diff --git a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
index a10e6654c..4898037e6 100644
--- a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
@@ -1,2 +1,3 @@
 debian/tmp/opt/trinity/bin/kapptemplate
 debian/tmp/opt/trinity/share/apps/kapptemplate
+debian/tmp/opt/trinity/share/man/man1/kapptemplate.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
deleted file mode 100644
index e558b802c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kapptemplate.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
index 0765b223f..4cfe9a49a 100644
--- a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
@@ -87,6 +87,9 @@ debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
+debian/tmp/opt/trinity/share/man/man1/catalogmanager.1
+debian/tmp/opt/trinity/share/man/man1/kbabel.1
+debian/tmp/opt/trinity/share/man/man1/kbabeldict.1
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
 debian/tmp/opt/trinity/share/services/tdefile_po.desktop
 debian/tmp/opt/trinity/share/services/pothumbnail.desktop
diff --git a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages
deleted file mode 100644
index e85be5938..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/catalogmanager.1
-debian/man/kbabel.1
-debian/man/kbabeldict.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
index 50b9c1fe5..d30028494 100644
--- a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png
+debian/tmp/opt/trinity/share/man/man1/kbugbuster.1
 debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
deleted file mode 100644
index 8fc558a77..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kbugbuster.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
index a163246b9..c327592b6 100644
--- a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
@@ -7,3 +7,7 @@ debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
 debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
 debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
 debian/tmp/opt/trinity/share/apps/kmtrace/kde.excludes
+debian/tmp/opt/trinity/share/man/man1/demangle.1
+debian/tmp/opt/trinity/share/man/man1/kminspector.1
+debian/tmp/opt/trinity/share/man/man1/kmmatch.1
+debian/tmp/opt/trinity/share/man/man1/kmtrace.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages
deleted file mode 100644
index 92133295d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/demangle.1
-debian/man/kmtrace.1
-debian/man/kminspector.1
-debian/man/kmmatch.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
index aca239beb..1876a13f0 100644
--- a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
@@ -29,4 +29,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kompare.svgz
+debian/tmp/opt/trinity/share/man/man1/kompare.1
 debian/icons/kompare.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages
deleted file mode 100644
index acf918455..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kompare.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
index 12523ee90..56d2f0262 100644
--- a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
@@ -3,3 +3,4 @@ debian/tmp/opt/trinity/lib/libkspy.la
 debian/tmp/opt/trinity/lib/libkspy.so
 debian/tmp/opt/trinity/lib/libkspy.so.1
 debian/tmp/opt/trinity/lib/libkspy.so.1.2.0
+debian/tmp/opt/trinity/share/man/man1/testkspy.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages
deleted file mode 100644
index 34831ba91..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/testkspy.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
index 0fbde204f..d1b7104cb 100644
--- a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kuiviewer.png
+debian/tmp/opt/trinity/share/man/man1/kuiviewer.1
 debian/tmp/opt/trinity/share/services/designerthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kuiviewer_part.desktop
 debian/icons/kuiviewer.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
deleted file mode 100644
index abcf3310b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuiviewer.1
diff --git a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
index 6f6370493..08ab2520e 100644
--- a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
@@ -8,4 +8,6 @@ debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
 debian/tmp/opt/trinity/lib/trinity/cvsservice.so
+debian/tmp/opt/trinity/share/man/man1/cvsaskpass.1
+debian/tmp/opt/trinity/share/man/man1/cvsservice.1
 debian/tmp/opt/trinity/share/services/cvsservice.desktop
diff --git a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
deleted file mode 100644
index 9afa8b3e7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/cvsaskpass.1
-debian/man/cvsservice.1
diff --git a/ubuntu/_base/core/tdesdk/debian/man/adddebug.1 b/ubuntu/_base/core/tdesdk/debian/man/adddebug.1
deleted file mode 100644
index d78dad43c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/adddebug.1
+++ /dev/null
@@ -1,45 +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 ADDDEBUG 1 "January 31, 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
-adddebug \- modifies Makefile(s) to add debug info
-.SH SYNOPSIS
-.B adddebug
-.RB "[ " \-k " ] [ " \-n " ] [ " \-r " ]"
-.SH DESCRIPTION
-\fBadddebug\fP modifies the \fIMakefile\fP in the current directory
-(and optionally in its subdirectories) to add debug info (\fI\-g3\fP).
-It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
-remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-k
-Keep optimisations (do not remove \fI\-O[1-9]?\fP flags which are
-removed by default).
-.TP
-.B \-n
-Compile without \fINDEBUG\fP and \fINO_DEBUG\fP being defined (this
-makes kdDebug calls work).
-.TP
-.B \-r
-Recursively search through all subdirectories of the current directory
-and operate on every Makefile that is found.
-.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/tdesdk/debian/man/build-progress.sh.1 b/ubuntu/_base/core/tdesdk/debian/man/build-progress.sh.1
deleted file mode 100644
index 28c9d9016..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/build-progress.sh.1
+++ /dev/null
@@ -1,56 +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 BUILD-PROGRESS.SH 1 "June 16, 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
-build-progress.sh \- show kde-build progress in your konsole/xterm title bar
-.SH SYNOPSIS
-.B build-progress.sh
-.SH DESCRIPTION
-\fBbuild-progress.sh\fP can be used to watch the progress of a large TDE
-build in the title bar of your konsole or xterm.
-.PP
-The TDE build must be running elsewhere as a separate process, and it
-must be done using
-.BR kde-build (1).
-.PP
-When you run build-progress.sh, it will sit in a permanent loop while
-kde-build runs.  The title bar of the konsole/xterm in which you ran
-build-progress.sh will be continually updated with the directory in
-which the TDE build is currently working.
-.PP
-You must run build-progress.sh from the top-level directory of the TDE
-build tree.  This directory must contain a file named
-\fIkde-buildrc\fP (which is also used by kde-build).  This
-\fIkde-buildrc\fP must contain valid settings for
-\fITDELOGDIR\fP and \fITDESRCDIR\fP, or else build-progress.sh will
-fail to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH FILES
-.TP
-\fIkde-buildrc\fP
-This file must be contained in the current directory, which must be the
-root of the TDE build tree.  See
-.BR kde-build (1)
-for further information.
-.SH SEE ALSO
-.BR kde-build (1).
-.SH AUTHOR
-build-progress.sh was written by Malte Starostik <malte@kde.org> and others.
-.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/tdesdk/debian/man/catalogmanager.1 b/ubuntu/_base/core/tdesdk/debian/man/catalogmanager.1
deleted file mode 100644
index db8b17613..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/catalogmanager.1
+++ /dev/null
@@ -1,66 +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 CATALOGMANAGER 1 "March 19, 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
-catalogmanager \- advanced catalog manager for KBabel
-.SH SYNOPSIS
-.B catalogmanager
-.RI "[ " generic-options " ]"
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.SH DESCRIPTION
-\fBCatalogManager\fP is part of a suite of programs for editing gettext
-message files (PO-files).  This suite is designed to help you translate fast
-and consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager (this program)
-is a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the catalogmanager-specific options.
-For a full summary of options, run \fIcatalogmanager \-\-help\fP.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.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/tdesdk/debian/man/cheatmake.1 b/ubuntu/_base/core/tdesdk/debian/man/cheatmake.1
deleted file mode 100644
index 098449a0b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cheatmake.1
+++ /dev/null
@@ -1,72 +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 CHEATMAKE 1 "September 27, 2002"
-.\" 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
-cheatmake \- fool make into not rebuilding certain files
-.SH SYNOPSIS
-.B cheatmake hidechange
-.I file
-.br
-.B cheatmake show
-.br
-.B cheatmake why
-.I file
-.SH DESCRIPTION
-\fBcheatmake\fP is used to save time when recompiling.  It can fool \fBmake\fP
-into skipping files that haven't changed in a meaningful way.  This can be
-used for instance when you change a comment in a file but none of the actual
-code.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-The different modes of operation are as follows.
-.TP
-\fBhidechange\fP \fIfile\fP
-Hides the fact that the given file has changed by moving its timestamp
-back into the past.  Use this option with care!
-.TP
-\fBshow\fP
-Lists which files make currently needs to rebuild.
-.TP
-\fBwhy\fP \fIfile\fP
-Explains why make must rebuild the given file.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1).
-.SH AUTHOR
-cheatmake was written by David Faure <faure@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/tdesdk/debian/man/create_cvsignore.1 b/ubuntu/_base/core/tdesdk/debian/man/create_cvsignore.1
deleted file mode 100644
index ce63f6f55..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_cvsignore.1
+++ /dev/null
@@ -1,42 +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 CREATE_CVSIGNORE 1 "March 20, 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
-create_cvsignore \- creates preliminary .cvsignore in current directory
-.SH SYNOPSIS
-.B create_cvsignore
-[ \fB\-r\fP ]
-.SH DESCRIPTION
-\fBcreate_cvsignore\fP is used to create a preliminary \fI.cvsignore\fP
-file in the current directory.  It does this by adding some standard
-stuff according to what it finds in \fIMakefile.am\fP.
-.PP
-No lines will be removed from any existing \fI.cvsignore\fP.
-If there is not already a \fI.cvsignore\fP, it will be added to the CVS
-repository.
-.PP
-Note that you must have a \fIMakefile.am\fP in the current directory for
-this tool to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-r\fP
-Recursively process this directory and all directories beneath it.
-.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/tdesdk/debian/man/create_makefile.1 b/ubuntu/_base/core/tdesdk/debian/man/create_makefile.1
deleted file mode 100644
index e128f23e9..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_makefile.1
+++ /dev/null
@@ -1,69 +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 CREATE_MAKEFILE 1 "September 26, 2002"
-.\" 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
-create_makefile \- creates Makefile.in and Makefile from a Makefile.am
-.SH SYNOPSIS
-.B create_makefile
-.I relativepath/Makefile
-.br
-.B create_makefile
-.I relativepath
-.SH DESCRIPTION
-\fBcreate_makefile\fP creates the \fIMakefile.in\fP and \fIMakefile\fP
-in a subdirectory containing a \fIMakefile.am\fP.
-This script saves time compared to re-running configure completely.
-.PP
-Note that you must supply the path to the desired \fIMakefile\fP, not the
-existing \fIMakefile.am\fP (though the final \fI/Makefile\fP may be omitted).
-.PP
-This script may be run from the toplevel directory (the
-one containing \fIconfigure\fP) or from one of its subdirectories.
-Note that \fIrelativepath\fP must be a relative path, not an absolute path.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that the \fIMakefile.am\fP
-and \fIMakefile.in\fP belong beneath the source directory and that the
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefiles (1).
-.SH AUTHOR
-create_makefile was written by David Faure <faure@kde.org> and others.
-.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/tdesdk/debian/man/create_makefiles.1 b/ubuntu/_base/core/tdesdk/debian/man/create_makefiles.1
deleted file mode 100644
index 2efc03795..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_makefiles.1
+++ /dev/null
@@ -1,63 +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 CREATE_MAKEFILES 1 "September 27, 2002"
-.\" 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
-create_makefiles \- recreates all Makefiles beneath a directory
-.SH SYNOPSIS
-.B create_makefiles
-.I dir
-.SH DESCRIPTION
-\fBcreate_makefiles\fP recreates all \fIMakefile\fPs in
-\fIdir\fP and its (recursed) subdirectories from the corresponding
-\fIMakefile.am\fP templates.
-.PP
-This script must be run from the toplevel directory (the
-one containing \fIconfigure\fP).
-This script saves time compared to re-running configure completely.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that each \fIMakefile.am\fP
-and \fIMakefile.in\fP belongs beneath the source directory and that each
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefile (1).
-.SH AUTHOR
-create_makefiles was written by David Faure <faure@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/tdesdk/debian/man/cvs-clean.1 b/ubuntu/_base/core/tdesdk/debian/man/cvs-clean.1
deleted file mode 100644
index 0706e485c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvs-clean.1
+++ /dev/null
@@ -1,50 +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 CVS-CLEAN 1 "March 20, 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
-cvs\-clean \- delete all files and directories not registered with CVS
-.SH SYNOPSIS
-.B cvs\-clean
-[ \fB-n, \-\-dry-run\fP ]
-[ \fB-h, \-\-help\fP ]
-.SH DESCRIPTION
-\fBcvs\-clean\fP recursively deletes everything in or beneath the
-current directory that is not known to CVS (i.e., that has not been
-checked out of or checked into a CVS repository).
-.PP
-A list of all files and directories that are deleted will be written to
-the console.
-.PP
-This script behaves similarly to the \fIcvs-clean\fP target from the
-file \fIadmin/Makefile.common\fP found in most TDE application sources.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-n, \-\-dry-run\fP
-Print the intended actions to the console, but do not change anything on
-the filesystem.
-.TP
-\fB-h, \-\-help\fP
-Display usage information.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-This utility was written by Oswald Buddenhagen <ossi@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/tdesdk/debian/man/cvs2dist.1 b/ubuntu/_base/core/tdesdk/debian/man/cvs2dist.1
deleted file mode 100644
index f0bc71a3e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvs2dist.1
+++ /dev/null
@@ -1,201 +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 CVS2DIST 1 "March 19, 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
-cvs2dist \- convert subdirectories within TDE CVS into standalone
-source packages
-.SH SYNOPSIS
-.B cvsdist
-.I path-to-module
-.I directory-in-module
-[ \fB\-n, \-\-name\fP \fIname\fP ]
-[ \fB\-v, \-\-version\fP \fIversion\fP ]
-[ \fB\-\-admin-dir\fP \fIdir\fP ]
-[ \fB\-\-cvs-root\fP \fIroot\fP ]
-[ \fB\-B, \-\-branch\fP \fIbranch\fP ]
-[ \fB\-\-no-i18n\fP ]
-[ \fB\-\-no-i18n-lang\fP \fIlanguages\fP ]
-[ \fB\-\-log=\fP\fIlogfile\fP | \fB\-l\fP ]
-[ \fB\-m, \-\-make-unpackaged\fP ]
-[ \fB\-g, \-\-no-gzip\fP ]
-[ \fB\-b, \-\-no-bz2, \-\-no-bzip2\fP ]
-[ \fB\-o, \-\-only-directory\fP ]
-[ \fB\-r, \-\-required-header\fP \fIheader\fP ]
-[ \fB\-e, \-\-required-header-error-message\fP \fImessage\fP ]
-[ \fB\-d, \-\-remove-hidden\fP ]
-[ \fB\-\-replace-files\fP \fIpairs\fP ]
-[[--] \fIaddfile\fP ... ]
-.PP
-.B cvsdist
-\fB\-h, \-\-help\fP
-.SH DESCRIPTION
-Each module in the TDE CVS tree contains a large number of applications
-all bundled together.
-\fBcvs2dist\fP is used to extract a single application or component from
-one of these large CVS modules and bundle it into a standalone package.
-The application or component will be bundled into a standard
-distribution tarball (with a configure script and so on) that users can
-download, build and install.
-.PP
-By default, cvs2dist automatically tries to check out all translations
-of strings and documentation from the corresponding parts of the
-\fItde-i18n\fP CVS module and include them in the final packages.
-This can be suppressed or modified using the options \-\-no-i18n or
-\-\-no-i18n-lang.
-.PP
-The initial argument \fIpath-to-module\fP should specify where the CVS
-module has been checked out on your system, and the second argument
-\fIdirectory-in-module\fP should specify which directory within this
-module is to be packaged (all subdirectories beneath it will be included
-and so on).  See the EXAMPLE section below for details.
-.PP
-Both gzip and bzip2 compressed tarballs will be created by default and
-will be called \fIname[-version].tar.gz\fP and \fIname[-version].tar.bz2\fP.
-The \fIname\fP component will be the last directory component of
-\fIdirectory-in-module\fP unless otherwise specified by \-\-name, and
-the \fIversion\fP component will not be included unless it is specified by
-\-\-version.
-.PP
-Additional files from outside the CVS tree can be included in the final
-packages by passing them after all other options (these are the
-\fIaddfile\fP arguments displayed above).  These additional files will
-be placed in the top level directory of the final packages.
-The \-\- that precedes them is optional.
-.PP
-Many options are available for customising these procedures, as seen below.
-Note that cvs2dist will remove any temporary files that it creates.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-n, \-\-name\fP \fIname\fP
-The name of the package (to be used in the names of the final tarballs
-and directories).  Specifically, the compressed tarballs will be called
-\fIname-version.tar.gz\fP and \fIname-version.tar.bz2\fP (see the
-\-\-version option below for further information).
-This package name defaults to the last directory component of
-\fIdirectory-in-module\fP.
-.TP
-\fB\-v, \-\-version\fP \fIversion\fP
-The version of the package (to be used in the names of the final
-tarballs and directories).  If this is not supplied, no version is used
-at all (i.e., the compressed tarballs will just be called \fIname.tar.gz\fP
-and \fIname.tar.bz2\fP).
-.TP
-\fB\-\-admin-dir\fP \fIdir\fP
-The location of \fIadmin/\fP on the filesystem.  Symbolic links may
-be used.  Defaults to \fIpath-to-module/admin\fP.
-.TP
-\fB\-\-cvs-root\fP \fIroot\fP
-The value to use as CVSROOT when checking out translations from CVS.
-Defaults to the CVSROOT environment variable.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-B, \-\-branch\fP \fIbranch\fP
-Use the given CVS branch for checking out translations from CVS.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-\-no-i18n\fP
-Do not check out any translations from CVS.
-.TP
-\fB\-\-no-i18n-lang\fP \fIlanguages\fP
-Exclude the given language(s) when checking out translations from CVS.
-The list of languages should be comma-separated,
-such as \fI\-\-no-i18n-lang uk,de,en_GB\fP .
-.TP
-\fB\-\-log=\fP\fIlogfile\fP
-Log all proceedings to the given logfile.  Note that the = is essential,
-and may not be omitted.
-.TP
-\fB\-l\fP
-Log all proceedings to the default logfile in the current directory.
-.TP
-\fB\-m, \-\-make-unpackaged\fP
-In addition to the compressed tarballs, an unpacked distribution will be
-created in the current directory.
-.TP
-\fB\-g, \-\-no-gzip\fP
-Do not create a gzip package (\fIname-version.tar.gz\fP).
-.TP
-\fB\-b, \-\-no-bz2, \-\-no-bzip2\fP
-Do not create a bzip2 package (\fIname-version.tar.bz2\fP).
-.TP
-\fB\-o, \-\-only-directory\fP
-Alias for \-mgb.  No packages will be created, only an unpacked directory.
-.TP
-\fB\-r, \-\-required-header\fP \fIheader\fP
-When the user runs configure, an error will be generated if
-\fIheader\fP is not found on the user's system.
-.TP
-\fB\-e, \-\-required-header-error-message\fP \fImessage\fP
-The error to display to a user when the header passed with
-\-\-required-header is not found on the user's system.  Defaults to a
-sensible message.
-.TP
-\fB\-d, \-\-remove-hidden\fP
-Remove hidden files and directories (e.g., dotfiles) from the packages.
-.TP
-\fB\-h, \-\-help\fP
-Display instructions on how to use cvs2dist.
-.TP
-\fB\-\-replace-files\fP \fIpairs\fP
-Move one or more files around in the final distribution packages.
-The \fIpairs\fP argument should be a comma-separated list of
-replacements to make.  Each replacement specifies a single file to move, and
-should be of the form \fIsource\fP@\fIdest\fP.
-.br
-For each replacement, the source file will be moved to the
-destination file (in particular, the source file will be deleted).
-All filenames are relative to the top-level directory
-of the package.  Spaces in filenames are not allowed.
-.br
-Please be careful when using this option!  Try to avoid the use of ..
-in the filenames, since it may cause unexpected problems.
-.br
-An example of this option might be
-\fI\-\-replace-files take_this_file@move_it_here,configure.in.bot.dist@configure.in.bot\fP .
-.SH EXAMPLE
-The following example creates packages of the kolf picture plugin from
-the CVS source tree currently checked out in \fI/sources\fP.
-.PP
-.RS
-\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
-\-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
-.RE
-.PP
-The packages will be named \fIkolf-picture-0.9\fP and
-the process will be logged.  For configure to succeed when a user builds
-these packages, the header \fIkolf/game.h\fP must be installed or an
-error will occur.  The additional file \fI~/tmp/extra-file\fP will be
-included in the packages even though it is not part of the CVS source tree.
-.SH FILES
-.TP
-\fI~/.cvs2distrc\fP
-Any options found in this file will be
-added to the beginning of the command-line arguments.
-.SH SEE ALSO
-.BR cvs (1).
-.PP
-For the latest updates to this script, see the cvs2dist website
-\fIhttp://www.katzbrown.com/shiritsu/programming/cvs2dist/\fP.
-.SH AUTHOR
-cvs2dist was written by Jason Katz-Brown <jason@katzbrown.com>,
-Sebastian Stein <seb.stein@hpfsc.de>, Dominique Devriese <devriese@kde.org>
-and Michael Buesch <mbuesch@freenet.de>.
-.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/tdesdk/debian/man/cvsaskpass.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsaskpass.1
deleted file mode 100644
index d4b7e5dfd..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsaskpass.1
+++ /dev/null
@@ -1,63 +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 CVSASKPASS 1 "March 19, 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
-cvsaskpass \- prompt for a password for the CVS DCOP service
-.SH SYNOPSIS
-.B cvsaskpass
-.RI "[ " generic-options " ]"
-.I prompt
-.SH DESCRIPTION
-This utility displays a dialog box prompting the user for the password to
-a CVS repository, then writes the password to standard output and exits.
-You should not need to run this program directly \- it is designed for
-the internal use of
-.BR cvsservice (1).
-.PP
-The prompt should be of the following form:
-.RS
-.PP
-\fIuser\fP@\fIhost\fP's password:
-.RE
-.PP
-This will allow the dialog box to display the details of the CVS
-repository to the user.
-.PP
-This utility is part of the CVS service provided with Cervisia, which in
-turn is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsaskpass \-\-help\fP.
-.SH RETURN VALUE
-If a password was succefully obtained, 0 is returned.  If no prompt was
-supplied on the command-line or if the dialog was cancelled, 1 is returned.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvsservice (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within another script or C++
-program can be found in \fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.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/tdesdk/debian/man/cvsbackport.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsbackport.1
deleted file mode 100644
index 7181ac671..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsbackport.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 CVSBACKPORT 1 "March 20, 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
-cvsbackport \- backport the last change in HEAD to a branch
-.SH SYNOPSIS
-.B cvsbackport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsbackport\fP will attempt to determine the last change made to
-the file in HEAD and then backport that change to a CVS branch (the
-branch name is hard-coded; see below).
-.PP
-The changes to be backported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from HEAD when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from the branch (and not from HEAD as they were
-before).
-.SH SEE ALSO
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.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/tdesdk/debian/man/cvscheck.1 b/ubuntu/_base/core/tdesdk/debian/man/cvscheck.1
deleted file mode 100644
index 3d79c255b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvscheck.1
+++ /dev/null
@@ -1,107 +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 CVSCHECK 1 "March 26, 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
-cvscheck \- offline status report for files in a checked-out CVS module
-.SH SYNOPSIS
-.B cvscheck
-[ \fB\-u, \-\-unknown\fP ]
-[ \fB\-m, \-\-modified\fP ]
-[ \fB\-\-missing\fP ]
-[ \fB\-t, \-\-tagged\fP ]
-[ \fB\-a, \-\-added\fP ]
-[ \fB\-r, \-\-removed\fP ]
-[ \fB\-c, \-\-conflicts\fP ]
-[ \fB\-l, \-\-local\fP ]
-[ \fIdir\fP ... ]
-.SH DESCRIPTION
-\fBcvscheck\fP prints information about the status of your local CVS
-checkout without communicating with the server.  This means it is
-extremely fast and does not require a network connection.
-.PP
-The given directories and all of their subdirectories will be processed
-recursively (though see the \-\-local option below).
-If no directory is given, the current directory and its
-recursed subdirectories will be used.
-.PP
-Each file with an interesting status will be printed with a status
-character in front of its name.  The status characters are as follows.
-.TP
-? \fIfoobar.c\fP
-The file is not known to CVS.  Maybe you should add it?
-.TP
-M \fIfoobar.c\fP
-The file is for sure locally modified.
-.TP
-m \fIfoobar.c\fP
-The file \fImight\fP have local changes.  You should diff with the
-server to make sure.
-.TP
-C \fIfoobar.c\fP
-The file has a CVS conflict and therefore cannot be committed.
-.TP
-U \fIfoobar.c\fP
-The file is in CVS but is somehow missing in your local checkout.
-.TP
-T \fIfoobar.c\fP
-The file has an unusual sticky CVS tag.
-.TP
-A \fIfoobar.c\fP
-You have "cvs add"ed this file but you have not yet committed.
-.TP
-R \fIfoobar.c\fP
-You have "cvs remove"d this file but you have not yet committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-By default cvscheck will display the status for all files in and
-beneath the requested directories.  The following options however can be
-used to display only files with a particular status and/or in a
-particular directory.
-.TP
-\fB\-u, \-\-unknown\fP
-Show only unknown (?) files.
-.TP
-\fB\-m, \-\-modified\fP
-Show only modified (m/M) files.
-.TP
-\fB\-\-missing\fP
-Show only missing (U) files.
-.TP
-\fB\-t, \-\-tagged\fP
-Show only tagged (T) files.
-.TP
-\fB\-a, \-\-added\fP
-Show only added (A) files.
-.TP
-\fB\-r, \-\-removed\fP
-Show only removed (R) files.
-.TP
-\fB\-c, \-\-conflicts\fP
-Show only conflict (C) files.
-.TP
-\fB\-l, \-\-local\fP
-Do not recurse.  That is, process the given directory but none of its
-subdirectories.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-cvscheck was written by Dirk Mueller <mueller@kde.org> and
-Sirtaj Singh Kang <taj@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/tdesdk/debian/man/cvsforwardport.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsforwardport.1
deleted file mode 100644
index 0ca6d29f5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsforwardport.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 CVSFORWARDPORT 1 "March 20, 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
-cvsforwardport \- forwardport the last change in a branch to HEAD
-.SH SYNOPSIS
-.B cvsforwardport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsforwardport\fP will attempt to determine the last change made to
-the file in the primary CVS branch and then forwardport that change to HEAD.
-The branch name is hard-coded; see below.
-.PP
-The changes to be forwardported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from the branch when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from HEAD (and not from the branch as they were
-before).
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.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/tdesdk/debian/man/cvslastchange.1 b/ubuntu/_base/core/tdesdk/debian/man/cvslastchange.1
deleted file mode 100644
index b651e4414..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvslastchange.1
+++ /dev/null
@@ -1,59 +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 CVSLASTCHANGE 1 "March 20, 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
-cvslastchange \- display the last committed changes for a file
-.SH SYNOPSIS
-.B cvslastchange
-\fIfile\fP [ \fIrevision\fP ]
-.br
-.B cvslastchange
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-.I file revision
-.SH DESCRIPTION
-\fBcvslastchange\fP displays the last changes committed to the CVS
-for the given file.
-It does this by launching '\fIcvs log\fP' and '\fIcvs diff\fP'.
-.PP
-If a revision is passed, the changes committed for that particular revision
-will be displayed.  Otherwise the currently checked out revision will be used.
-.PP
-This tool works with other branches as well as with HEAD.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-These options are currently ignored.
-.SH ENVIRONMENT VARIABLES
-.TP
-CVSLASTCHANGE_KEEP_WHITESPACE
-Define this variable if you do not want the whitespace to be modified
-in any way when displaying changes.  Usually the whitespace is tidied
-up a little before the changes are displayed on screen.
-.br
-This variable is useful if you are using cvslastchange to extract a
-patch that can be applied elsewhere.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (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/tdesdk/debian/man/cvslastlog.1 b/ubuntu/_base/core/tdesdk/debian/man/cvslastlog.1
deleted file mode 100644
index 445a1a74a..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvslastlog.1
+++ /dev/null
@@ -1,39 +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 CVSLASTLOG 1 "March 20, 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
-cvslastlog \- prints the log of the last commit for a file
-.SH SYNOPSIS
-.B cvslastlog
-.I file
-.SH DESCRIPTION
-\fBcvslastlog\fP shows the log associated with the last CVS commit for the
-given file.
-It depends on the version of the local file, not the one on the server.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-cvslastlog was written by David Faure <faure@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/tdesdk/debian/man/cvsrevertlast.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsrevertlast.1
deleted file mode 100644
index aedf45aa6..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsrevertlast.1
+++ /dev/null
@@ -1,38 +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 CVSREVERTLAST 1 "March 20, 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
-cvsrevertlast \- revert files in CVS by one version
-.SH SYNOPSIS
-.B cvsrevertlast
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBcvsrevertlast\fP is used to revert all the files on the command line
-by one version in CVS.  The files will not be committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1).
-.SH AUTHOR
-This utility was written by Charles Samuels <charles@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/tdesdk/debian/man/cvsservice.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsservice.1
deleted file mode 100644
index 9d5c791d7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsservice.1
+++ /dev/null
@@ -1,79 +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 CVSSERVICE 1 "March 19, 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
-cvsservice \- a DCOP service for accessing CVS repositories
-.SH SYNOPSIS
-.B cvsservice
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-The CVS service is a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard
-.BR dcop (1)
-command-line tool.
-.PP
-DCOP is the Desktop Communication Protocol used throughout TDE.
-.PP
-The CVS DCOP service consists of the following three parts:
-.TP
-\fBCvsService\fP
-The main interface to the functionality of the
-.BR cvs (1)
-command line client.  There is one method for each CVS command, e.g., add,
-checkout, commit, etc.  The methods assemble the command line
-arguments, create a CvsJob and return a DCOPRef object for it
-to the caller.  There is one instance of this service for each
-application instance.
-.TP
-\fBRepository\fP
-This DCOPObject manages the configuration data of the current
-CVS repository.  The data is automatically updated when other
-service instances change it.
-.TP
-\fBCvsJob\fP
-This class represents a CVS job.  You can execute and cancel it,
-and you can retrieve the output of the cvs client by either
-connecting to the proper DCOP signals or by using the output()
-method.  There are two types of jobs.  First the non-concurrent
-job which has to run alone, like cvs update or import.  Second
-the jobs which can run concurrently like cvs log or annotate.
-.PP
-The CVS service is provided with Cervisia, which is part of the TDE
-Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsservice \-\-help\fP.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvs (1),
-.BR cvsaskpass (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within a shell script, a C++
-program or through the JavaScript bindings can be found in
-\fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.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/tdesdk/debian/man/cxxmetric.1 b/ubuntu/_base/core/tdesdk/debian/man/cxxmetric.1
deleted file mode 100644
index a8a855cde..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cxxmetric.1
+++ /dev/null
@@ -1,34 +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 CXXMETRIC 1 "January 31, 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
-cxxmetric \- simple source metrics for C and C++
-.SH SYNOPSIS
-.B cxxmetric
-.RI "[ " file " ... ]"
-.SH DESCRIPTION
-\fBcxxmetric\fP counts lines of code, comment and blank space and
-calculates various other statistics for each given source file.
-Source files must be in C or C++.
-.PP
-If no source files are specified then all C/C++ files in or beneath the
-current directory will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.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/tdesdk/debian/man/demangle.1 b/ubuntu/_base/core/tdesdk/debian/man/demangle.1
deleted file mode 100644
index 8f4f3922f..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/demangle.1
+++ /dev/null
@@ -1,57 +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 DEMANGLE 1 "February 25, 2003"
-.\" 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
-demangle \- undo C++ name mangling for symbols
-.SH SYNOPSIS
-.B demangle
-.SH DESCRIPTION
-\fBDemangle\fP reads a list of C++ mangled symbol names from standard
-input and converts these names to human-readable form on standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-Create a file called \fInames\fP containing the following mangled symbol
-names:
-.PP
-.RS
-_ZNK6Object10metaObjectEv
-.br
-_ZN8QPtrListI5ArrowE5clearEv
-.br
-_ZTC4Kolf0_11TDEMainWindow
-.RE
-.PP
-These names can then be demangled as follows:
-.PP
-.RS
-\fIexample$\fP demangle < names
-.br
-Object::metaObject() const
-.br
-QPtrList<Arrow>::clear()
-.br
-construction vtable for TDEMainWindow-in-Kolf
-.RE
-.SH SEE ALSO
-.BR kminspector (1),
-.BR kmmatch (1),
-.BR kmtrace (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/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/dprof2calltree.1
deleted file mode 100644
index 88bcd0b0d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/dprof2calltree.1
+++ /dev/null
@@ -1,60 +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 DPROF2CALLTREE 1 "October 15, 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
-dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B dprof2calltree
-\fB\-f\fP \fIinput\fP
-[ \fB\-o\fP \fIoutput\fP ]
-.SH DESCRIPTION
-\fBdprof2calltree\fP reads the \fItmon.out\fP profiling data output by
-Perl's Devel::DProf profiling package, and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the DProf \fItmon.out\fP file to convert.
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output to the given file for use by KCachegrind.
-If omitted, the output will be written to file of the form
-\fIcachgrind.out.<input>\fP.
-.SH EXAMPLE
-If you run a perl script as:
-.PP
-.RS
-perl -d:DProf yourscript.pl
-.RE
-.PP
-then this will write profiling data to \fItmon.out\fP.  You can then
-work with this data in KCachegrind as follows:
-.PP
-.RS
-dprof2calltree -f tmin.out -o cachegrind.out.foo
-.br
-tdecachegrind cachegrind.out.foo
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.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/tdesdk/debian/man/extend_dmalloc.1 b/ubuntu/_base/core/tdesdk/debian/man/extend_dmalloc.1
deleted file mode 100644
index 0078442ef..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extend_dmalloc.1
+++ /dev/null
@@ -1,43 +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 EXTEND_DMALLOC 1 "April 29, 2001"
-.\" 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
-extend_dmalloc \- analyse return-addresses from dmalloc logfiles
-.SH SYNOPSIS
-.B extend_dmalloc
-.I dmalloc-log binary
-.SH DESCRIPTION
-\fBextend_dmalloc\fP will run
-.BR gdb (1)
-to get information on the return-addresses from a
-.BR dmalloc (1)
-logfile.  Specifically it will examine any \fIra=\fP lines and try to
-get the corresponding line numbers.
-.PP
-The argument \fIbinary\fP must be the binary that generated the log
-\fIdmalloc-log\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH NOTES
-You may wish to direct the output from extend_dmalloc to a file, since
-otherwise gdb seems to prompt for a return as if you are at the end of a
-page.
-.SH AUTHOR
-extend_dmalloc was written by Gray Watson <gray.watson@letters.com>.
-.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/tdesdk/debian/man/extractattr.1 b/ubuntu/_base/core/tdesdk/debian/man/extractattr.1
deleted file mode 100644
index 7e506e449..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extractattr.1
+++ /dev/null
@@ -1,61 +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 EXTRACTATTR 1 "March 20, 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
-extractattr \- extract element attributes from UI and XML GUI files
-.SH SYNOPSIS
-.B extractattr
-\fB\-\-attr=\fP\fIname\fP
-[ \fB\-\-attr=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractattr \-\-help
-.SH DESCRIPTION
-\fBextractattr\fP finds all of the given element attributes within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
-.PP
-Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-attr=\fP\fIname\fP
-Specifies an attribute to be extracted.  This option may be used
-multiple times.
-.br
-The \fIname\fP argument must be of the form
-\fIElement\fP,\fIattribute\fP or
-\fIElement\fP,\fIattribute\fP,\fIcontext\fP.
-.br
-The context is optional, and is used in constructing the i18n() calls.
-If specified it will override the default context set by \fB\-\-context\fP.
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH EXAMPLE
-extractattr \-\-attr=Title,data \-\-attr=Description,data,Stencils file.ui
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.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/tdesdk/debian/man/extractrc.1 b/ubuntu/_base/core/tdesdk/debian/man/extractrc.1
deleted file mode 100644
index 130fdb089..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extractrc.1
+++ /dev/null
@@ -1,60 +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 EXTRACTRC 1 "March 20, 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
-extractrc \- extract message strings from UI and XML GUI files
-.SH SYNOPSIS
-.B extractrc
-[ \fB\-\-tag\-group=\fP\fIgroup\fP ]
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractrc \-\-help
-.SH DESCRIPTION
-\fBextractrc\fP finds all text tags and other message strings within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.
-.PP
-It understands both Qt designer (.ui) files and XML GUI (.rc) files.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Note that the old \fB\-\-lines\fP option is deprecated; source line
-numbers are now always included in comments.
-.TP
-\fB\-\-tag\-group=\fP\fIgroup\fP
-Use a predefined group of tags that we are interested in.
-Valid groups are default, koffice and none.
-The default group will be used if this option is omitted.
-.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", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.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/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/_base/core/tdesdk/debian/man/findmissingcrystal.1
deleted file mode 100644
index 32b23294e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/findmissingcrystal.1
+++ /dev/null
@@ -1,42 +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 FINDMISSINGCRYSTAL 1 "February 6, 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
-findmissingcrystal \- determine which TDE Crystal icons are the same as
-the TDE Classic hicolor icons
-.SH SYNOPSIS
-.B findmissingcrystal
-.I module
-.SH DESCRIPTION
-\fBfindmissingcrystal\fP is a small utility that runs through the icons
-in the given TDE module and determines which Crystal icons from that
-module are identical to the old TDE Classic hicolor icons.
-.PP
-This script \fBmust\fP be run from the top-level directory of a TDE source
-tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
-It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fItdeartwork\fP
-module (which contains the old hicolor icons).
-.PP
-For each Crystal icon in the given module, a message will be output
-describing whether the icon is new (no matching hicolor icon was found),
-different from the hicolor icon or the same as the hicolor icon.
-.PP
-This utility is part of the TDE Software Development Kit.
-.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/tdesdk/debian/man/fixkdeincludes.1 b/ubuntu/_base/core/tdesdk/debian/man/fixkdeincludes.1
deleted file mode 100644
index 6c5bea183..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/fixkdeincludes.1
+++ /dev/null
@@ -1,73 +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 FIXTDEINCLUDES 1 "January 31, 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
-fixkdeincludes \- reduce the number of #includes in TDE source files
-.SH SYNOPSIS
-.B fixkdeincludes
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-e, \-\-experimental\fP ]
-[ \fB\-m, \-\-modify\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixkdeincludes \-\-help
-.SH DESCRIPTION
-\fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
-files.  Much of its processing is specific to TDE sources and so it
-might not work so well with sources for non-TDE applications.
-.PP
-The following problems are identified by fixkdeincludes:
-.PP
-.RS
-Including headers that are no longer supported but which exist for
-compatibility with older Qt/KDE versions;
-.PP
-Including the same file multiple times;
-.PP
-Using #include <...> instead of #include "...".
-.RE
-.PP
-There is also an experimental mode which tries removing each #include
-one at a time (with a few exceptions) to see whether the source still
-compiles.  Note that this experimental mode will modify the original sources.
-.PP
-By default the sources will not be modified; the identified problems
-will simply be written to standard output.
-.PP
-The list of C++ sources to examine should be given on the command-line.
-If no files are given, all C++ sources in or beneath the current
-directory will be examined (with the exception of directories whose
-\fIMakefile.am\fP contains \-UTQT_NO_COMPAT or \-UTDE_NO_COMPAT).
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-e, \-\-experimental\fP
-Experimental mode, as described above in detail.  Note that this option
-implies \fB\-\-modify\fP.
-.TP
-\fB\-m, \-\-modify\fP
-As well as writing messages to standard output, actually modify the
-original sources to fix any problems that were found.
-.SH AUTHOR
-fixkdeincludes was written by Dirk Mueller <mueller@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/tdesdk/debian/man/fixuifiles.1 b/ubuntu/_base/core/tdesdk/debian/man/fixuifiles.1
deleted file mode 100644
index 17ce46a61..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/fixuifiles.1
+++ /dev/null
@@ -1,63 +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 FIXUIFILES 1 "March 20, 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
-fixuifiles \- remove undesirable features from TQt/TDE .ui files
-.SH SYNOPSIS
-.B fixuifiles
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-\-omitqtcheck\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixuifiles \-\-help
-.SH DESCRIPTION
-\fBfixuifiles\fP processes one or more TQt/TDE user interface definition
-files (.ui files) and tries to remove some of the insanities found
-therein.  If no filenames are given, fixuifiles will process all .ui
-files in or beneath the current directory.
-.PP
-The following problems are fixed:
-.PP
-.RS
-Too high minimum Qt version;
-.PP
-Hardcoded untranslatable Alt+Letter accels (auto-added by Qt Designer);
-.PP
-Captions that are equal to class names (auto-added by Qt Designer).
-.RE
-.PP
-The threshold Qt version can be set
-using either a \fI.qt_minversion\fP file (containing simply the Qt version
-number) or a \fIconfigure.in.in\fP file (containing an appropriate
-MIN_CONFIG macro).  These files may be in the directory containing the .ui
-file or any parent directory.  If no threshold Qt version is found,
-a sensible default will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-\-omitqtcheck\fP
-Do not check the minimum Qt version.
-.SH AUTHOR
-fixuifiles was written by David Faure <faure@kde.org> and
-Dirk Mueller <mueller@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/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/hotshot2calltree.1
deleted file mode 100644
index 8c4d4441c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/hotshot2calltree.1
+++ /dev/null
@@ -1,57 +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 HOTSHOT2CALLTREE 1 "October 15, 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
-hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B hotshot2calltree
-[ \fB\-\-file\-limit\fP \fIlimit\fP ]
-\fB\-o\fP \fIoutput\fP \fIinput\fP [ \fIinput\fP ... ]
-.SH DESCRIPTION
-\fBhotshot2calltree\fP reads one or more pstat profiling data files
-as output by the hotshot python profiler, and converts them into
-calltree format for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output into the given file for use by KCachegrind.
-This may be \fB\-\fP if you wish to write to standard output.
-.TP
-\fIinput\fP ...
-Read the hotshot profiling data from the given file(s).
-.TP
-\fB\-\-file\-limit\fP \fIlimit\fP
-Stop after the given number of input files.
-.SH EXAMPLE
-Suppose that you have used hotshot to profile a python app, with results
-dumped to the file \fIpythongrind.prof\fP.  You may then work with this
-data in KCachegrind as follows.
-.PP
-.RS
-hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
-.br
-tdecachegrind cachegrind.out.0
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Jorg Beyer <job@webde-ag.de>.
-.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/tdesdk/debian/man/kapptemplate.1 b/ubuntu/_base/core/tdesdk/debian/man/kapptemplate.1
deleted file mode 100644
index 1010ecd52..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kapptemplate.1
+++ /dev/null
@@ -1,69 +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 KAPPTEMPLATE 1 "January 31, 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
-kapptemplate \- creates a framework to develop a TDE application
-.SH SYNOPSIS
-.B kapptemplate
-[ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
-.RB "[ " \-\-full\-app " | " \-\-kpart\-app " | " \-\-kpart\-plugin
-.RB " | " \-\-existing " ]"
-.PP
-.B kapptemplate \-\-help
-.SH DESCRIPTION
-\fBKAppTemplate\fP is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.SS General Options
-.TP
-\-\-help
-Display a full summary of options.
-.TP
-\-\-noinit
-Don't run 'make \-f Makefile.cvs'.
-.TP
-\-\-default
-Use default values instead of prompting.
-.SS Framework Types
-.TP
-\-\-full\-app
-Create a full featured TDE application.
-.TP
-\-\-kpart\-app
-Create a full featured KPart application.
-.TP
-\-\-kpart\-plugin
-Create a KPart plugin framework.
-.TP
-\-\-existing
-Converting existing source to an automake/autoconf TDE framework.
-.SH FILES
-.TP
-.I ~/.kapptemplate
-Stores default values.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kapptemplate/\fP.
-.SH AUTHOR
-KAppTemplate was written by Kurt Granroth <granroth@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/tdesdk/debian/man/kbabel.1 b/ubuntu/_base/core/tdesdk/debian/man/kbabel.1
deleted file mode 100644
index 047e3626d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbabel.1
+++ /dev/null
@@ -1,74 +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 KBABEL 1 "March 19, 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
-kbabel \- a PO-file editor for TDE
-.SH SYNOPSIS
-.B kbabel
-.RI "[ " generic-options " ]"
-[ \fB\-\-gotomsgid\fP \fImsgid\fP ] [ \fB\-\-nosplash\fP ]
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.RI "[ " file " ]"
-.SH DESCRIPTION
-\fBKBabel\fP is part of a suite of programs for editing gettext message
-files (PO-files).  It is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel (this
-program) is an advanced and easy to use PO-file editor with full navigational
-and editing capabilities, syntax checking and statistics.  CatalogManager is
-a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabel-specific options.
-For a full summary of options, run \fIkbabel \-\-help\fP.
-.TP
-\fB\-\-gotomsgid\fP \fImsgid\fP
-Go to the entry with the given message ID.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR catalogmanager (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.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/tdesdk/debian/man/kbabeldict.1 b/ubuntu/_base/core/tdesdk/debian/man/kbabeldict.1
deleted file mode 100644
index ffd9b4658..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbabeldict.1
+++ /dev/null
@@ -1,66 +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 KBABELDICT 1 "March 19, 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
-kbabeldict \- the KBabel dictionary for translators
-.SH SYNOPSIS
-.B kbabeldict
-.RI "[ " generic-options " ]"
-.RB "[ " \-\-nosplash " ]"
-.SH DESCRIPTION
-\fBKBabelDict\fP is part of a suite of programs for editing gettext message
-files (PO-files).  This suite is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict (this program) is a dictionary to assist
-with searching for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabeldict-specific options.
-For a full summary of options, run \fIkbabeldict \-\-help\fP.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR catalogmanager (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.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/tdesdk/debian/man/kbugbuster.1 b/ubuntu/_base/core/tdesdk/debian/man/kbugbuster.1
deleted file mode 100644
index 29b9c38d7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbugbuster.1
+++ /dev/null
@@ -1,50 +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 KBUGBUSTER 1 "January 31, 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
-kbugbuster \- front end for the TDE bug tracking system
-.SH SYNOPSIS
-.B kbugbuster
-.RI "[ " generic-options " ]"
-[ \fB\-d, \-\-disconnected\fP ]
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-[ \fB\-\-bug\fP \fInumber\fP ]
-.SH DESCRIPTION
-\fBKBugBuster\fP is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbugbuster-specific options.
-For a full summary of options, run \fIkbugbuster \-\-help\fP.
-.TP
-[ \fB\-d, \-\-disconnected\fP ]
-Start in disconnected mode.
-.TP
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-Start with the bug list for the given package.
-.TP
-[ \fB\-\-bug\fP \fInumber\fP ]
-Start with the given bug report.
-.SH AUTHOR
-KBugBuster was written by Martijn Klingens <klingens@kde.org>,
-Simon Hausmann <hausmann@kde.org>, Cornelius Schumacher <schumacher@kde.org>
-and David Faure <faure@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/tdesdk/debian/man/kdedoc.1 b/ubuntu/_base/core/tdesdk/debian/man/kdedoc.1
deleted file mode 100644
index 1911442c2..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdedoc.1
+++ /dev/null
@@ -1,42 +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 TDEDOC 1 "January 31, 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
-kdedoc \- view documentation for a TDE class
-.SH SYNOPSIS
-.B kdedoc
-.I classname
-.SH DESCRIPTION
-\fBkdedoc\fP opens the documentation for the TDE class \fIclassname\fP
-in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the tdelibs documentation installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLES
-To bring up help on the class TDEAboutDialog:
-.PP
-.RS
-kdedoc TDEAboutDialog
-.RE
-.SH DEBIAN USERS
-The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
-which will need to be installed.
-.SH SEE ALSO
-.BR qtdoc (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/tdesdk/debian/man/kdelnk2desktop.py.1 b/ubuntu/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
deleted file mode 100644
index 41cce73a5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
+++ /dev/null
@@ -1,39 +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 KDELNK2DESKTOP.PY 1 "November 14, 2002"
-.\" 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
-kdelnk2desktop.py \- converts .kdelnk to .desktop
-.SH SYNOPSIS
-.B kdelnk2desktop.py
-.RI "[ " kdelnk-file " ] ..."
-.SH DESCRIPTION
-\fBkdelnk2desktop.py\fP is used to convert
-a \fI.kdelnk\fP file (used by KDE 1) into a \fI.desktop\fP
-file (used by KDE 2 and later).
-.PP
-File \fIkdelnk-file\fP must have a name ending in \fI.kdelnk\fP.
-After kdelnk2desktop.py is run, this will be replaced by a new file
-ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
-removed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
-the results of this script are unpredictable.
-.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/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/_base/core/tdesdk/debian/man/kdemangen.pl.1
deleted file mode 100644
index 8acd79df1..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdemangen.pl.1
+++ /dev/null
@@ -1,51 +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 KDEMANGEN.PL 1 "October 15, 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
-kdemangen.pl \- automatically create a draft manpage for a TDE app
-.SH SYNOPSIS
-.B kdemangen.pl
-.I /path/to/application
-.SH DESCRIPTION
-\fBkdemangen.pl\fP will automatically create a draft manpage for a TDE
-application.  Manpages are always better when hand-tailored, but this
-should give you a fairly good start.
-.PP
-To create the manpage, it will use the \-\-author and \-\-help\-all
-output for the application passed on the command line.
-It will also use the description in the
-Debian control file if one is available.  To make use of this additional
-feature, you must run kdemangen.pl from within the \fIdebian/\fP
-subdirectory of the application sources.
-.PP
-The new manpage will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-This utility will only work for a full TDE application that uses
-TDECmdLineArgs (which most full TDE applications do).
-.SH EXAMPLE
-.RS
-cd /path/to/tde/srcs/tdeedu/debian
-.br
-kdemangen /usr/bin/kstars > kstars.1
-.RE
-.SH AUTHOR
-kdemangen.pl was written by Dominique Devriese <devriese@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/tdesdk/debian/man/kminspector.1 b/ubuntu/_base/core/tdesdk/debian/man/kminspector.1
deleted file mode 100644
index 29cb70e5b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kminspector.1
+++ /dev/null
@@ -1,50 +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 KMINSPECTOR 1 "February 25, 2003"
-.\" 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
-kminspector \- run a program with the TDE memory leak tracer
-.SH SYNOPSIS
-.B kminspector
-\fIprogram\fP [ \fIprogram-args\fP ]
-.SH DESCRIPTION
-\fBKMinspector\fP runs the given program, examines its memory
-allocation behaviour using \fIlibktrace\fP and pipes the resulting
-allocation tree through \fIless\fP.
-.PP
-The given program does not need to be specially compiled.
-.PP
-This utility is provided with KMtrace,
-a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.PP
-Much more extensive documentation for KMtrace can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.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/tdesdk/debian/man/kmmatch.1 b/ubuntu/_base/core/tdesdk/debian/man/kmmatch.1
deleted file mode 100644
index d80c15542..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kmmatch.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 KMMATCH 1 "February 26, 2003"
-.\" 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
-kmmatch \- search for symbols in a map file
-.SH SYNOPSIS
-.B kmmatch
-.I map-file call-file
-.SH DESCRIPTION
-\fBKMMatch\fP determines which symbols from a given set (\fIcall-file\fP) are
-present in a given map file.
-.PP
-The \fImap-file\fP should contain output from \fInm\fP (which extracts
-information from object files).  It must \fBnot\fP contain any blank
-lines or header information (such as the name of the object file); this
-means you may need to strip the first few lines of \fInm\fP output from
-the \fImap-file\fP.
-.PP
-The \fIcall-file\fP should contain a list of symbols (such as function
-calls made by a program), one per line.
-.PP
-This utility will find which of the symbols in \fIcall-file\fP are
-present in \fImap-file\fP and write them to standard error, one per
-line, in the order in which they appear in \fIcall-file\fP.
-.PP
-Note that this utility is called \fBmatch\fP in the original TDE
-distribution; it has been renamed to \fBkmmatch\fP in Debian to
-avoid conflicts with unrelated packages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmtrace (1),
-.BR nm (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/tdesdk/debian/man/kmtrace.1 b/ubuntu/_base/core/tdesdk/debian/man/kmtrace.1
deleted file mode 100644
index 14f5f9fc8..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kmtrace.1
+++ /dev/null
@@ -1,72 +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 KMTRACE 1 "February 25, 2003"
-.\" 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
-kmtrace \- a TDE memory leak tracer
-.SH SYNOPSIS
-.B kmtrace
-[ \fIgeneric-options\fP ]
-[ \fB\-x, \-\-exclude\fP \fIfile\fP ]
-[ \fB\-e, \-\-exe\fP \fIfile\fP ]
-[ \fB\-t, \-\-tree\fP \fIfile\fP
-[ \fB\-\-th, \-\-treethreshold\fP \fIvalue\fP ]
-[ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
-[ \fItrace-log\fP ]
-.SH DESCRIPTION
-\fBKMtrace\fP is a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-KMtrace will investigate the trace log specified on the command line,
-or \fIktrace.out\fP if no trace log is specified.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kmtrace-specific options.
-For a full summary of options, run \fIkmtrace \-\-help\fP.
-.TP
-\fB\-x, \-\-exclude\fP \fIfile\fP
-File containing symbols to exclude from output.
-.TP
-\fB\-e, \-\-exe\fP \fIfile\fP
-Executable to use for looking up unknown symbols.
-.TP
-\fB\-t, \-\-tree\fP \fIfile\fP
-Write a tree of the allocations to the given file.
-.TP
-\fB\-\-th, \-\-treethreshold\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees allocating less than the
-given memory amount.
-.TP
-\fB\-\-td, \-\-treedepth\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees that are deeper than the
-specified depth.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmmatch (1).
-.PP
-Much more extensive documentation can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.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/tdesdk/debian/man/kompare.1 b/ubuntu/_base/core/tdesdk/debian/man/kompare.1
deleted file mode 100644
index e777752e1..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kompare.1
+++ /dev/null
@@ -1,79 +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 KOMPARE 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
-kompare \- a TDE GUI for viewing differences between files
-.SH SYNOPSIS
-.B kompare
-[ \fIgeneric-options\fP ]
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-c\fP ] \fIURL1 URL2\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-o\fP [ \fB\-n\fP ]] \fIdiff\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] \fB\-b\fP \fIURL diff\fP
-.SH DESCRIPTION
-\fBKompare\fP is a graphical user interface for viewing the differences
-between two files.  It will also optionally create a diff file.
-.PP
-Depending upon what is passed on the command line, Kompare can compare
-documents, display diff files and blend diff files back into original
-documents.
-.PP
-If an url is given as - then Kompare will read the corresponding file
-from standard input.  Thus (for instance) Kompare can be used as:
-.PP
-.RS
-cvs diff | kompare \-o \-
-.RE
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kompare-specific options.
-For a full summary of options, run \fIkompare \-\-help\fP.
-.TP
-\fB\-b\fP \fIURL diff\fP
-Blends \fIdiff\fP into URL.  \fIdiff\fP is expected to be diff output and
-\fIURL\fP the file or folder that the diff output needs to be blended into.
-.TP
-\fB\-c\fP \fIURL1 URL2\fP
-Compares \fIURL1\fP with \fIURL2\fP.  This is the default mode if two
-URLs are passed.
-.TP
-\fB\-n\fP
-Used with \fB\-o\fP to stop Kompare from checking for the original file.
-.TP
-\fB\-o\fP \fIdiff\fP
-Opens the given diff file.  This is the default mode if only one URL is
-passed.
-.br
-Kompare will check to see if it can find
-the original file(s).  If it can, it will blend the original file(s) into
-the diff output and show the result in the viewer.  Passing \fB\-n\fP
-will disable this check.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kompare/\fP.
-.SH AUTHOR
-Kompare was written by John Firebaugh <jfirebaugh@kde.org>,
-Otto Bruggeman <otto.bruggeman@home.nl> and others.
-.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/tdesdk/debian/man/kuiviewer.1 b/ubuntu/_base/core/tdesdk/debian/man/kuiviewer.1
deleted file mode 100644
index 5439127ae..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kuiviewer.1
+++ /dev/null
@@ -1,65 +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 KUIVIEWER 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
-kuiviewer \- a viewer for Qt Designer user interface files
-.SH SYNOPSIS
-.B kuiviewer
-.RI "[ " generic-options " ]"
-.RI "[ " ui-file ... " ]"
-.PP
-.B kuiviewer
-.RI "[ " generic-options " ]"
-{ \fB\-s, \-\-takescreenshot\fP \fIfilename\fP }
-[ \fB\-w, \-\-screenshotwidth\fP \fIint\fP ]
-[ \fB\-h, \-\-screenshotheight\fP \fIint\fP ]
-.I ui-file
-.SH DESCRIPTION
-\fBKUIViewer\fP is a utility to display and test the user interface (.ui)
-files generated by \fBQt Designer\fP.  The interfaces can be displayed in a
-variety of different widget styles.
-.PP
-Normally KUIViewer launches a full GUI, allowing the user to interact with
-the given interface.
-By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
-screenshot of the interface instead and exit immediately.  Other options
-are available to control precisely how this screenshot is constructed.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kuiviewer-specific options.
-For a full summary of options, run \fIkuiviewer \-\-help\fP.
-.TP
-\fB\-s, \-\-takescreenshot\fP \fIfilename\fP
-Take a screenshot of the given interface and exit immediately.
-The \fIfilename\fP argument specifies where the screenshot will be saved.
-This screenshot will be saved in PNG format.
-.TP
-\fB\-w, \-\-screenshotwidth\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given width.
-.TP
-\fB\-h, \-\-screenshotheight\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given height.
-.SH SEE ALSO
-.BR designer (1).
-.SH AUTHOR
-KUIViewer was written by Richard Moore <rich@kde.org>,
-Ian Reinhart Geiser <geiseri@kde.org> and
-Benjamin C. Meyer <ben+kuiviewer@meyerhome.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/tdesdk/debian/man/licensecheck.1 b/ubuntu/_base/core/tdesdk/debian/man/licensecheck.1
deleted file mode 100644
index 48728f2c2..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/licensecheck.1
+++ /dev/null
@@ -1,37 +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 LICENSECHECK 1 "January 31, 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
-licensecheck \- simple license checker for source files
-.SH SYNOPSIS
-.B licensecheck
-.RB "[ " \-v " ]"
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBlicensecheck\fP examines the comments at the beginning of each given
-source file and tries to determine which license the file is placed
-under.  It does this by searching for blocks of text that it recognises
-as belonging to various licenses.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-v
-Verbose mode.
-.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/tdesdk/debian/man/makeobj.1 b/ubuntu/_base/core/tdesdk/debian/man/makeobj.1
deleted file mode 100644
index 50a9f864f..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/makeobj.1
+++ /dev/null
@@ -1,66 +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 MAKEOBJ 1 "March 20, 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
-makeobj \- run make from the correct directory
-.SH SYNOPSIS
-.B makeobj
-[ \fImake-argument\fP ... ]
-.SH DESCRIPTION
-\fBmakeobj\fP is a wrapper around \fBmake\fP which basically checks
-whether it's in the source directory or the build directory and changes
-to the correct directory before calling make.
-.PP
-The command-line arguments will (generally) be passed directly to make.
-.PP
-This script is useful if the source directory is different from the
-build directory and the Makefiles are kept in the build directory, as is
-common for instance when building the TDE sources.  This script can however
-be used in more standard scenarios (such as non-TDE projects for which the
-source and build directories are the same), where it will behave just like
-make.
-.PP
-One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
-should be set to indicate where the build directory is in relation to
-the source directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1),
-.BR sed (1).
-.SH AUTHOR
-makeobj was written by Stephan Kulow <coolo@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/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/memprof2calltree.1
deleted file mode 100644
index d4f52ead4..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/memprof2calltree.1
+++ /dev/null
@@ -1,36 +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 MEMPROF2CALLTREE 1 "October 15, 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
-memprof2calltree \- convert memprof profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B memprof2calltree
-.SH DESCRIPTION
-\fBmemprof2calltree\fP reads the memory profiles of memprof and
-converts them into calltree format for use by KCachegrind.
-.PP
-The memprof data must be supplied on standard input, and the
-corresponding calltree data will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.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/tdesdk/debian/man/op2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/op2calltree.1
deleted file mode 100644
index 0242e6cd6..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/op2calltree.1
+++ /dev/null
@@ -1,43 +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 OP2CALLTREE 1 "October 15, 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
-op2calltree \- convert OProfile profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B op2calltree
-.SH DESCRIPTION
-\fBop2calltree\fP reads the profiling data output by OProfile v0.8 and
-converts it into calltree format for use by KCachegrind.
-.PP
-The OProfile data must be supplied on standard input, and should be
-obtained by running:
-.PP
-.RS
-opreport \-gdf
-.RE
-.PP
-This converter will then write a separate calltree data file for each
-application, to a file of the form \fIoprof.out.<app>\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.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/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/_base/core/tdesdk/debian/man/package_crystalsvg.1
deleted file mode 100644
index 32d8644e9..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/package_crystalsvg.1
+++ /dev/null
@@ -1,41 +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 PACKAGE_CRYSTALSVG 1 "October 15, 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
-package_crystalsvg \- bundle up Crystal SVG sources from a TDE checkout
-.SH SYNOPSIS
-.B package_crystalsvg
-.SH DESCRIPTION
-\fBpackage_crystalsvg\fP assumes that the current directory contains one
-or more checked-out TDE modules.  It searches these modules for Crystal
-SVG vector sources (.svgz or .svg.gz files)
-and packages them up into a tarball.  The tarball will also
-contain \fIFILES\fP (describing the contents of the tarball and which
-TDE modules/paths they were copied from) as well as some other bits and
-pieces.
-.PP
-Note that you must at least have tdelibs checked out for this utility to
-run.
-.PP
-The final tarball will be created in the current working directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-package_crystalsvg was written by Frans Englich <frans.englich@telia.com>.
-.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/tdesdk/debian/man/png2mng.pl.1 b/ubuntu/_base/core/tdesdk/debian/man/png2mng.pl.1
deleted file mode 100644
index c86c17275..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/png2mng.pl.1
+++ /dev/null
@@ -1,49 +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 PNG2MNG.PL 1 "October 15, 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
-png2mng.pl \- combine a set of PNG images into an animated MNG image
-.SH SYNOPSIS
-.B png2mng.pl
-.I basename width height
-.SH DESCRIPTION
-\fBpng2mng.pl\fP reads a sequence of PNG images and combines them into
-a single animated MNG image.
-.PP
-The individual PNG images should be numbered consecutively from zero up,
-and should have names of the form
-.I basenameXXXX
-where
-.I XXXX
-is the four-digit sequence number (0000, 0001, 0002, etc).
-The width and height of the PNG images should
-also be included on the command line.
-.PP
-The final animated MNG image will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-The following example will combine the files hi32-action-kde-0000.png,
-hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
-the resulting animated image to hi32-action-kde.mng:
-.PP
-.RS
-png2mng.pl hi32-action-kde- 32 32 > hi32-action-kde.mng
-.RE
-.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/tdesdk/debian/man/po2xml.1 b/ubuntu/_base/core/tdesdk/debian/man/po2xml.1
deleted file mode 100644
index d2f7fe5df..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/po2xml.1
+++ /dev/null
@@ -1,40 +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 PO2XML 1 "March 19, 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
-po2xml \- translates a DocBook XML file using a PO-file
-.SH SYNOPSIS
-.B po2xml
-.I original-XML translated-PO
-.SH DESCRIPTION
-\fBpo2xml\fP is a command-line tool that translates the DocBook
-XML file \fIoriginal-XML\fP using the gettext message file
-\fItranslated-PO\fP.  The resulting translated XML file is sent to standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.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/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/pprof2calltree.1
deleted file mode 100644
index b5cf9082c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/pprof2calltree.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 PPROF2CALLTREE 1 "October 15, 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
-pprof2calltree \- convert APD profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B pprof2calltree
-\fB\-f\fP \fIinput\fP
-.SH DESCRIPTION
-\fBpprof2calltree\fP reads the pprof profiling data output by
-APD (http://pecl.php.net/apd/), and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the APD pprof trace file to convert.  This generally has a
-name of the form \fIpprof.XXXXX.Y\fP.  The calltree output for
-KCachegrind will then be written to the file \fIcachegrind.out.XXXXX.Y\fP.
-.SH EXAMPLE
-Suppose you profile a script with APD and obtain the pprof trace file
-\fIpprof.12345.1\fP.  You can then work with this data in KCachegrind as
-follows.
-.PP
-.RS
-pprof2calltree -f pprof.12345.1
-.br
-tdecachegrind cachegrind.out.12345.1
-.RE
-.PP
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.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/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/_base/core/tdesdk/debian/man/pruneemptydirs.1
deleted file mode 100644
index 108c7e4db..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/pruneemptydirs.1
+++ /dev/null
@@ -1,65 +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 PRUNEEMPTYDIRS 1 "September 27, 2002"
-.\" 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
-pruneemptydirs \- detects stale source dirs in a CVS tree
-.SH SYNOPSIS
-.B pruneemptydirs
-[ \fB\-f\fP ]
-.SH DESCRIPTION
-\fBpruneemptydirs\fP is used to clean up a local CVS tree.
-It detects directories containing remnants of old stuff which has been
-removed from the CVS.  Such stale directories often break compilation.
-The current directory and all directories beneath it will be examined.
-.PP
-Note that this tool does not remove anything; it simply prints what to
-do as a series of remove commands.  You can copy and paste these commands,
-or use them with eval in a script.
-.PP
-This tool works better if the source directory is not the same as the
-build directory, since it will not print directories containing old
-executables.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP
-Actually perform the deletions instead of just printing them out.
-Use this option with care (no warranties, etc.)!
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH AUTHOR
-pruneemptydirs was written by David Faure <faure@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/tdesdk/debian/man/qtdoc.1 b/ubuntu/_base/core/tdesdk/debian/man/qtdoc.1
deleted file mode 100644
index 3b7c09f60..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/qtdoc.1
+++ /dev/null
@@ -1,50 +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 QTDOC 1 "January 31, 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
-qtdoc \- view documentation for a Qt class
-.SH SYNOPSIS
-.B qtdoc
-.RI "[ " classname " ]"
-.SH DESCRIPTION
-\fBqtdoc\fP opens a Qt help page in kfm/konqueror.
-If \fIclassname\fP is given, it opens the help page for that class (note
-that the class name is case insensitive).  Otherwise the main Qt help
-page is opened.  It is assumed that you have the Qt documentation
-installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-QTDIR
-The directory beneath which the Qt documentation is installed.
-Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
-If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
-.SH EXAMPLES
-To bring up help on class QString:
-.PP
-.RS
-qtdoc QString
-.RE
-.SH DEBIAN USERS
-The Qt documentation is in the Debian package \fIqt3-doc\fP, which will
-need to be installed.
-.SH SEE ALSO
-.BR kdedoc (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/tdesdk/debian/man/split2po.1 b/ubuntu/_base/core/tdesdk/debian/man/split2po.1
deleted file mode 100644
index 539e2f6c8..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/split2po.1
+++ /dev/null
@@ -1,60 +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 SPLIT2PO 1 "March 19, 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
-split2po \- creates a PO-file from two DocBook XML files
-.SH SYNOPSIS
-.B split2po
-.I original-XML translated-XML
-.SH DESCRIPTION
-\fBsplit2po\fP is a command-line tool that takes the two given DocBook
-XML files and produces a gettext message file (PO-file) that represents
-the changes between them.  The resulting PO-file is sent to standard
-output.
-.PP
-.I translated-XML
-must be the result of translating
-.I original-XML
-into another language.  It is this translation that the resulting
-PO-file will represent.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-NO_CREDITS
-If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
-will be omitted.  By default these are always included at the end of
-the PO-file, with empty message strings.
-.br
-These messages are used with TDE documentation, so you may wish to set
-NO_CREDITS if you are working with some other type of non-TDE documentation.
-.TP
-REPORT_MISMATCHES
-Set this variable to "no" if you wish mismatch reporting to be
-suppressed.  By default, any apparent mismatches between the two XML
-files will be noted on standard error.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.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/tdesdk/debian/man/swappo.1 b/ubuntu/_base/core/tdesdk/debian/man/swappo.1
deleted file mode 100644
index bb1289d9b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/swappo.1
+++ /dev/null
@@ -1,44 +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 SWAPPO 1 "March 19, 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
-swappo \- swap msgid and msgstr fields in a PO-file
-.SH SYNOPSIS
-.B swappo
-.I PO-file
-.SH DESCRIPTION
-\fBswappo\fP reads the given PO-file and swaps the \fImsgid\fP and
-\fImsgstr\fP fields for every message.  The result is a new PO-file that
-translates in the opposite direction.  For example, if \fIPO-file\fP
-translates from English to French, the new PO-file will translate from
-French to English.
-.PP
-The new PO-file will be written to standard output.  The old PO-file
-will remain untouched.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.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/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/_base/core/tdesdk/debian/man/tdecachegrind.1
deleted file mode 100644
index d5f3ea064..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/tdecachegrind.1
+++ /dev/null
@@ -1,67 +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 TDECACHEGRIND 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
-tdecachegrind \- a visualisation tool for valgrind profiling output
-.SH SYNOPSIS
-.B tdecachegrind
-.RI "[ " generic-options " ]"
-[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
-.SH DESCRIPTION
-\fBKCachegrind\fP is a visualisation tool for the profiling data generated
-by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-.PP
-For visualising the output from other profiling tools, several converters
-are available.  On Debian systems these can be found in the
-\fItdecachegrind-converters\fP package.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the tdecachegrind-specific options.
-For a full summary of options, run \fItdecachegrind \-\-help\fP.
-.TP
-\fB\-r\fP \fIexec\fP
-Run the program \fIexec\fP under cachegrind.
-.TP
-\fItrace-file\fP
-Visualise data from the given trace.
-.SH SEE ALSO
-.BR calltree (1),
-.BR dprof2calltree (1),
-.BR hotshot2calltree (1),
-.BR memprof2calltree (1),
-.BR op2calltree (1),
-.BR pprof2calltree (1),
-.BR valgrind (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/tdecachegrind/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/tdecachegrind/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
-.SH AUTHOR
-KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.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/tdesdk/debian/man/tdekillall.1 b/ubuntu/_base/core/tdesdk/debian/man/tdekillall.1
deleted file mode 100644
index 92bf4380c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/tdekillall.1
+++ /dev/null
@@ -1,36 +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 TDEKILLALL 1 "April 29, 2001"
-.\" 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
-tdekillall \- kills processes started with tdeinit
-.SH SYNOPSIS
-.B tdekillall
-[ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
-.SH DESCRIPTION
-\fBtdekillall\fP kills all processes with a particular name
-that were started through tdeinit.  Specifically, it kills all processes
-\fBtdeinit:\fP \fIprocess-name\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\fP\fIsignal\fP
-Kill the processes with signal \fIsignal\fP.  This option defaults to
-SIGTERM.  Run \fIkill \-l\fP for a list of possible signals.
-.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/tdesdk/debian/man/testkspy.1 b/ubuntu/_base/core/tdesdk/debian/man/testkspy.1
deleted file mode 100644
index afdc702a4..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/testkspy.1
+++ /dev/null
@@ -1,46 +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 TESTKSPY 1 "May 3, 2001"
-.\" 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
-testkspy \- show off KSpy's capabilities
-.SH SYNOPSIS
-.B testkspy
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBtestkspy\fP is a small application that shows off KSpy's capabilities.
-It simply uses KSpy to spy on itself.
-.PP
-\fBKSpy\fP is a tiny library which can be used to graphically display
-the TQObjects in use by a TQt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-.PP
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fItestkspy \-\-help\fP.
-.SH SEE ALSO
-Instructions on using KSpy with your own applications can be found in
-\fI/usr/share/doc/kspy/README\fP.
-.SH AUTHOR
-KSpy was written by Richard Moore <rich@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/tdesdk/debian/man/transxx.1 b/ubuntu/_base/core/tdesdk/debian/man/transxx.1
deleted file mode 100644
index 6dba22392..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/transxx.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 TRANSXX 1 "March 19, 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
-transxx \- create a basic fleshed-out PO-file from a PO-template file
-.SH SYNOPSIS
-.B transxx
-[ \fB\-\-text\fP \fItranslation\fP ]
-.I template
-.SH DESCRIPTION
-\fBtransxx\fP is a command-line tool that produces a basic fleshed-out
-PO-file from a PO-template file.  Some of the formatting and
-structure of the \fImsgid\fP strings will be copied to the \fImsgstr\fP
-strings, but otherwise text will be translated to "xx".
-.PP
-The fleshed-out PO-file is sent to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-text\fP \fItranslation\fP
-Use the given translation everywhere instead of "xx".
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.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/tdesdk/debian/man/umbrello.1 b/ubuntu/_base/core/tdesdk/debian/man/umbrello.1
deleted file mode 100644
index 3c5d77d5e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/umbrello.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 UMBRELLO 1 "March 19, 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
-umbrello \- a UML modelling tool and code generator
-.SH SYNOPSIS
-.B umbrello
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-.PP
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIumbrello \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/umbrello/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/umbrello/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
-.SH AUTHOR
-Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
-many others.
-.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/tdesdk/debian/man/xml2pot.1 b/ubuntu/_base/core/tdesdk/debian/man/xml2pot.1
deleted file mode 100644
index 0b1a293d5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/xml2pot.1
+++ /dev/null
@@ -1,45 +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 XML2POT 1 "March 19, 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
-xml2pot \- creates a PO-template file from a DocBook XML file
-.SH SYNOPSIS
-.B xml2pot
-.I original-XML
-.SH DESCRIPTION
-\fBxml2pot\fP is a command-line tool that produces a gettext message
-template file from the DocBook XML file \fIoriginal-XML\fP.
-The template file is sent to standard output.
-.PP
-The resulting template file can be used to create gettext message files
-(PO-files) for a variety of languages.  These can then be used in conjunction
-with
-.BR po2xml (1)
-to translate the original XML file into these other languages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.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/tdesdk/debian/man/zonetab2pot.py.1 b/ubuntu/_base/core/tdesdk/debian/man/zonetab2pot.py.1
deleted file mode 100644
index d6a4330ad..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/zonetab2pot.py.1
+++ /dev/null
@@ -1,39 +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 ZONETAB2POT.PY 1 "November 14, 2002"
-.\" 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
-zonetab2pot.py \- converts a timezone list to a PO-file template
-.SH SYNOPSIS
-.B zonetab2pot.py
-[ \fItimezone-list\fP ]
-.SH DESCRIPTION
-\fBzonetab2pot.py\fP reads the timezone list given on the command-line
-and converts it to a gettext message file (PO-file) template containing
-the names of the individual timezones.
-.PP
-The given timezone list should be in the same format as the system
-\fIzone.tab\fP.  If no timezone list is specified on the command-line,
-\fI/usr/share/zoneinfo/zone.tab\fP will be used.
-.PP
-The new PO-file template will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-zonetab2pot.py was written by Lukas Tinkl <lukas@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/tdesdk/debian/poxml-trinity.install b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
index 290c62266..c82e32dc2 100644
--- a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/split2po
 debian/tmp/opt/trinity/bin/swappo
 debian/tmp/opt/trinity/bin/transxx
 debian/tmp/opt/trinity/bin/xml2pot
+debian/tmp/opt/trinity/share/man/man1/po2xml.1
+debian/tmp/opt/trinity/share/man/man1/split2po.1
+debian/tmp/opt/trinity/share/man/man1/swappo.1
+debian/tmp/opt/trinity/share/man/man1/transxx.1
+debian/tmp/opt/trinity/share/man/man1/xml2pot.1
diff --git a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages
deleted file mode 100644
index 05e2191bf..000000000
--- a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/po2xml.1
-debian/man/split2po.1
-debian/man/swappo.1
-debian/man/transxx.1
-debian/man/xml2pot.1
diff --git a/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules
index d7be7d400..d044b50c8 100755
--- a/ubuntu/_base/core/tdesdk/debian/rules
+++ b/ubuntu/_base/core/tdesdk/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg
 
@@ -32,77 +31,35 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
 binary-install/tdesdk-scripts-trinity::
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
-	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
-		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
-	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
-		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
-	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/opt/trinity/share/man/man1/
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man
+	mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean \
+		debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean-kde
+	mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svnversions \
+		debian/$(cdbs_curpkg)/opt/trinity/bin/svnversion-kde
 	install -p -D -m644 scripts/kde-buildrc \
-		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
 
 binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
 	install -p -D -m644 tdeioslave/svn/AUTHORS \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
 	install -p -D -m644 tdeioslave/svn/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
 	install -p -D -m644 kprofilemethod/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
-		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck
+		debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.scheck
 
 binary-install/kapptemplate-trinity::
-	rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
 	for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
-		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
+		chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
-	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/opt/trinity/share/
-
-binary-install/kbabel-trinity::
-	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/opt/trinity/share/
-
-binary-install/kbugbuster-trinity::
-	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/opt/trinity/share/
-
-binary-install/kmtrace-trinity::
-	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/opt/trinity/share/
-
-binary-install/kompare-trinity::
-	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/opt/trinity/share/
-
-binary-install/kspy-trinity::
-	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/opt/trinity/share/
-
-binary-install/kuiviewer-trinity::
-	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/opt/trinity/share/
-
-binary-install/libcvsservice0-trinity::
-	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/opt/trinity/share/
-
-binary-install/poxml-trinity::
-	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/opt/trinity/share/
 
 binary-install/tdecachegrind-converters-trinity::
-	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/opt/trinity/share/
-
-binary-install/tdecachegrind-trinity::
-	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/opt/trinity/share/
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
 
 binary-install/umbrello-trinity::
-	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/opt/trinity/share/
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/umbrello/headings
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..59f576d85 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/hotshot2calltree
 debian/tmp/opt/trinity/bin/memprof2calltree
 debian/tmp/opt/trinity/bin/op2calltree
 debian/tmp/opt/trinity/bin/pprof2calltree
+debian/tmp/opt/trinity/share/man/man1/dprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/hotshot2calltree.1
+debian/tmp/opt/trinity/share/man/man1/memprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/op2calltree.1
+debian/tmp/opt/trinity/share/man/man1/pprof2calltree.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
deleted file mode 100644
index 977c48e2d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/dprof2calltree.1
-debian/man/hotshot2calltree.1
-debian/man/memprof2calltree.1
-debian/man/op2calltree.1
-debian/man/pprof2calltree.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
index b1b9b739e..eae1a8494 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
@@ -15,5 +15,6 @@ debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/man/man1/tdecachegrind.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop
 debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
deleted file mode 100644
index 367c3db5d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdecachegrind.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
index 8d88a20a5..7b71e3bd9 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -50,15 +50,48 @@ debian/tmp/opt/trinity/bin/svngettags
 debian/tmp/opt/trinity/bin/svnchangesince
 debian/tmp/opt/trinity/bin/svn-clean
 debian/tmp/opt/trinity/share/apps/katepart/syntax/tdesvn-buildrc.xml
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
 debian/tmp/opt/trinity/share/man/man1/cvsblame.1
 debian/tmp/opt/trinity/share/man/man1/cvsversion.1
-debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
+debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
 debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
+debian/tmp/opt/trinity/share/man/man1/adddebug.1
+debian/tmp/opt/trinity/share/man/man1/build-progress.sh.1
+debian/tmp/opt/trinity/share/man/man1/cheatmake.1
+debian/tmp/opt/trinity/share/man/man1/create_cvsignore.1
+debian/tmp/opt/trinity/share/man/man1/create_makefile.1
+debian/tmp/opt/trinity/share/man/man1/create_makefiles.1
+debian/tmp/opt/trinity/share/man/man1/cvs-clean.1
+debian/tmp/opt/trinity/share/man/man1/cvs2dist.1
+debian/tmp/opt/trinity/share/man/man1/cvsbackport.1
+debian/tmp/opt/trinity/share/man/man1/cvscheck.1
+debian/tmp/opt/trinity/share/man/man1/cvsforwardport.1
+debian/tmp/opt/trinity/share/man/man1/cvslastchange.1
+debian/tmp/opt/trinity/share/man/man1/cvslastlog.1
+debian/tmp/opt/trinity/share/man/man1/cvsrevertlast.1
+debian/tmp/opt/trinity/share/man/man1/cxxmetric.1
+debian/tmp/opt/trinity/share/man/man1/extend_dmalloc.1
+debian/tmp/opt/trinity/share/man/man1/extractattr.1
+debian/tmp/opt/trinity/share/man/man1/extractrc.1
+debian/tmp/opt/trinity/share/man/man1/findmissingcrystal.1
+debian/tmp/opt/trinity/share/man/man1/fixkdeincludes.1
+debian/tmp/opt/trinity/share/man/man1/fixuifiles.1
+debian/tmp/opt/trinity/share/man/man1/kdedoc.1
+debian/tmp/opt/trinity/share/man/man1/kdelnk2desktop.py.1
+debian/tmp/opt/trinity/share/man/man1/kdemangen.pl.1
+debian/tmp/opt/trinity/share/man/man1/makeobj.1
+debian/tmp/opt/trinity/share/man/man1/package_crystalsvg.1
+debian/tmp/opt/trinity/share/man/man1/png2mng.pl.1
+debian/tmp/opt/trinity/share/man/man1/pruneemptydirs.1
+debian/tmp/opt/trinity/share/man/man1/qtdoc.1
+debian/tmp/opt/trinity/share/man/man1/tdekillall.1
+debian/tmp/opt/trinity/share/man/man1/zonetab2pot.py.1
 scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
 scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
 scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
diff --git a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
deleted file mode 100644
index bcab66ddd..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/man/adddebug.1
-debian/man/build-progress.sh.1
-debian/man/cheatmake.1
-debian/man/create_cvsignore.1
-debian/man/create_makefile.1
-debian/man/create_makefiles.1
-debian/man/cvs-clean.1
-debian/man/cvs2dist.1
-debian/man/cvsbackport.1
-debian/man/cvscheck.1
-debian/man/cvsforwardport.1
-debian/man/cvslastchange.1
-debian/man/cvslastlog.1
-debian/man/cvsrevertlast.1
-debian/man/cxxmetric.1
-debian/man/extend_dmalloc.1
-debian/man/extractattr.1
-debian/man/extractrc.1
-debian/man/fixkdeincludes.1
-debian/man/fixuifiles.1
-debian/man/findmissingcrystal.1
-debian/man/kdedoc.1
-debian/man/tdekillall.1
-debian/man/kdelnk2desktop.py.1
-debian/man/kdemangen.pl.1
-debian/man/makeobj.1
-debian/man/package_crystalsvg.1
-debian/man/png2mng.pl.1
-debian/man/pruneemptydirs.1
-debian/man/qtdoc.1
-debian/man/zonetab2pot.py.1
diff --git a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
index dbb79a2ad..7f0fe3b2a 100644
--- a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
@@ -48,5 +48,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/mimetypes/umbrellofile.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+debian/tmp/opt/trinity/share/man/man1/umbrello.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-umbrello.desktop
 debian/icons/umbrello.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages
deleted file mode 100644
index 537bedefe..000000000
--- a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/umbrello.1
diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/versions.pl b/ubuntu/_base/core/tdetoys/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdetoys/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdetoys/debian/compat b/ubuntu/_base/core/tdetoys/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdetoys/debian/compat
+++ b/ubuntu/_base/core/tdetoys/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdetoys/debian/control b/ubuntu/_base/core/tdetoys/debian/control
index e56160909..52013bf49 100644
--- a/ubuntu/_base/core/tdetoys/debian/control
+++ b/ubuntu/_base/core/tdetoys/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>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
index 34499d446..4ce8d6ef8 100644
--- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
@@ -2,10 +2,12 @@ debian/tmp/opt/trinity/bin/kweatherservice
 debian/tmp/opt/trinity/bin/kweatherreport
 debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
 debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.la
 debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
 debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
@@ -27,5 +29,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png
 debian/tmp/opt/trinity/share/man/man1/kweatherreport.1
 debian/tmp/opt/trinity/share/man/man1/kweatherservice.1
 debian/tmp/opt/trinity/share/services/kweatherservice.desktop
-debian/tmp/opt/trinity/share/services/kcmweather.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherapplet.desktop
 debian/tmp/opt/trinity/share/services/kcmweatherservice.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherstations.desktop
diff --git a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst
deleted file mode 100644
index 99a084399..000000000
--- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kweather-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdetoys/debian/rules b/ubuntu/_base/core/tdetoys/debian/rules
index b8b2b309b..cbd7532de 100755
--- a/ubuntu/_base/core/tdetoys/debian/rules
+++ b/ubuntu/_base/core/tdetoys/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..66bb7fec8 100644
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1 @@
 ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.install b/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
index 27b3cea81..d09a8b0e4 100644
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
@@ -31,6 +31,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ark.svgz
+debian/tmp/opt/trinity/share/man/man1/ark.1
 debian/tmp/opt/trinity/share/services/ark_part.desktop
 
 debian/icons/ark.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages
deleted file mode 100644
index 37ed04716..000000000
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ark-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst
deleted file mode 100644
index b919d035f..000000000
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for ark-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdeutils/debian/cdbs/versions.pl b/ubuntu/_base/core/tdeutils/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdeutils/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdeutils/debian/compat b/ubuntu/_base/core/tdeutils/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeutils/debian/compat
+++ b/ubuntu/_base/core/tdeutils/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control
index bd25d44d8..00bd9a8e4 100644
--- a/ubuntu/_base/core/tdeutils/debian/control
+++ b/ubuntu/_base/core/tdeutils/debian/control
@@ -4,8 +4,8 @@ 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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Standards-Version: 3.8.4
 
 Package: tdeutils-trinity
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..3c468628f 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1 @@
 kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
index e5c35395d..6e4aab038 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kcalc.svgz
+debian/tmp/opt/trinity/share/man/man1/kcalc.1
 
 debian/icons/kcalc.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcalc-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages
deleted file mode 100644
index ee2f0ad0a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcalc-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst
deleted file mode 100644
index 6cf1c841c..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kcalc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
index 46f690528..e362682f0 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcharselect.png
+debian/tmp/opt/trinity/share/man/man1/kcharselect.1
 
 debian/icons/kcharselect.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcharselect-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages
deleted file mode 100644
index 6a1e28fb7..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcharselect-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
index f8e6118ce..12a5d1ae6 100644
--- a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
@@ -28,6 +28,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwikdisk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwikdisk.png
+debian/tmp/opt/trinity/share/man/man1/kdf.1
+debian/tmp/opt/trinity/share/man/man1/kwikdisk.1
 
 debian/icons/kdf.xpm		/opt/trinity/share/pixmaps
 debian/icons/kdf-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages
deleted file mode 100644
index ac5e86975..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdf-trinity.1
-debian/man/kwikdisk-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
index 40d08d1ab..a03e4587a 100644
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kedit.png
+debian/tmp/opt/trinity/share/man/man1/kedit.1
 
 debian/icons/kedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kedit-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fbe5924d2 100644
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1 @@
 kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages
deleted file mode 100644
index 84374715a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kedit-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst
deleted file mode 100644
index 1fa143a43..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kedit-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
index 5c1588041..645753df5 100644
--- a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kfloppy.png
+debian/tmp/opt/trinity/share/man/man1/kfloppy.1
 
 debian/icons/kfloppy.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfloppy-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages
deleted file mode 100644
index 02c1ea86f..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfloppy-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
index 2317f8bad..81993777a 100644
--- a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
@@ -39,6 +39,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kgpg.png
+debian/tmp/opt/trinity/share/man/man1/kgpg.1
 
 debian/icons/kgpg.xpm		/opt/trinity/share/pixmaps
 debian/icons/kgpg-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages
deleted file mode 100644
index 111b73663..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kgpg-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
index 7ac6b4f2e..9ee6fc10c 100644
--- a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/khexedit1.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/khexedit.png
+debian/tmp/opt/trinity/share/man/man1/khexedit.1
 debian/tmp/opt/trinity/share/services/kbyteseditwidget.desktop
 debian/tmp/opt/trinity/share/services/khexedit2part.desktop
 
diff --git a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages
deleted file mode 100644
index 41235ebfd..000000000
--- a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/khexedit-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1
deleted file mode 100644
index d738284f4..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH Ark "1" "May 2006" "Ark" "User Commands"
-.SH NAME
-Ark \- manual page for Ark
-.SH SYNOPSIS
-.B ark
-[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
-.SH DESCRIPTION
-TDE Archiving tool
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if the appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the TDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-.SS "Generic options"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-tde\-tempfile\fR
-Show TDE\-tempfile specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-extract\fR
-Open extract dialog, quit when finished
-.TP
-\fB\-\-extract\-to\fR
-Extract 'archive' to 'folder'. Quit when finished.
-\&'folder' will be created if it does not exist.
-.TP
-\fB\-\-add\fR
-Ask for the name of the archive to add 'files' to. Quit when finished.
-.TP
-\fB\-\-add\-to\fR
-Add 'files' to 'archive'. Quit when finished.
-\&'archive' will be created if it does not exist.
-.TP
-\fB\-\-guess\-name\fR
-Used with '\-\-extract\-to'. When specified, 'archive'
-will be extracted to a subfolder of 'folder'
-whose name will be the name of 'archive' without the filename extension.
-.SS "Arguments"
-.TP
-folder
-Folder to extract to
-.TP
-files
-Files to be added
-.TP
-archive
-Open 'archive'
-.SH AUTHOR
-Ark was written by Matthias Elter <elter@kde.org> and many others.
-.br
-Ark is released under the GNU General Public License.
-.PP
-This manual page was written by Sune Vuorela <debian@pusling.com>
-for the Debian Project, and is released under the same terms as the program.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1
deleted file mode 100644
index eff470650..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator"
-.SH NAME
-kcalc
-\- TDE Calculator
-.SH SYNOPSIS
-\fBkcalc\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
-.br
-.IP "     \-"
-\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations.
-.IP "     \-"
-\fBKCalc\fP allows you to cut and paste numbers from/into its display.
-.IP "     \-"
-\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results.
-.IP "     \-"
-You can configure \fBKCalc\fP's display colors and font.
-.IP "     \-"
-You can configure \fBKCalc\fP's precision and the number of digits after the period.
-.IP "     \-"
-\fBKCalc\fP offers a great number of useful  key\-bindings, which make using \fBKCalc\fP without using a pointing device easy.
-.PP
-Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding.
-
-.SH OPTIONS
-.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 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 
-.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
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/kcalcrc
-\fBkcalc\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kcalc/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kcalc/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Klaus Niederkruger <kniederk@math.uni\-koeln.de>
-.br
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-Evan Teran <eteran@alum.rit.edu>
-.br
-Espen Sand <espen@kde.org>
-.br
-Chris Howells <howells@kde.org>
-.br
-Aaron J. Seigo <aseigo@olympusproject.org>
-.br
-Charles Samuels <charles@altair.dhs.org>
-.br
-René Mérou <ochominutosdearco@yahoo.es>
-.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/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kcharselect-trinity.1
deleted file mode 100644
index 8eac79da4..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kcharselect-trinity.1
+++ /dev/null
@@ -1,257 +0,0 @@
-.lf 1 info/tdeutils.kcharselect.1
-.TH KCHARSELECT 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kcharselect \- TDE Character Selector
-.SH SYNOPSIS
-.B kcharselect
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KCharSelect
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Using
-.B KCharSelect
-one can view all the glyphs, organized by character table, available from any
-installed font.  One can also assemble a string of characters by clicking on
-characters in the table.  The string can be exported to the clipboard for
-later use.
-.PP
-.B KCharSelect
-is helpful for determining which characters in a font have glyphs as well as
-for selecting characters that may be difficult to produce.
-.P
-This program is part of the official TDE utils module.
-.SH OPTIONS
-.SS "General Options"
-.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\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdetqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 48 info/tdeutils.kcharselect.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 50 info/tdeutils.kcharselect.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kcharselectrc
-configuration file.
-.SH AUTHOR
-KCharSelect was written by
-.nh
-.ad l
-Reginald Stadlbauer <reggie@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B KCharSelect
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcharselect
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kcharselect
-
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1
deleted file mode 100644
index 58bbbec90..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility"
-.SH NAME
-kdf
-\- TDE free disk space utility
-.SH SYNOPSIS
-\fBkdf\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.
-.sp 1
-\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times.
-.SH OPTIONS
-.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 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 
-.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
-
-.SH SEE ALSO
-\fBkwikdisk\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kedit-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kedit-trinity.1
deleted file mode 100644
index ebf6a588b..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kedit-trinity.1
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor"
-.SH NAME
-kedit
-\- TDE text editor
-.SH SYNOPSIS
-\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP
-.SH DESCRIPTION
-\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
-.sp 1
-\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File or URL to open
-.SS Options:
-.TP
-.B  \-\-encoding  <encoding>
-Encoding to use for the following documents
-.SS 
-.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 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 
-.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 
-
-.SH SEE ALSO
-\fBkate\fP(1), \fBkwrite\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kfloppy-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kfloppy-trinity.1
deleted file mode 100644
index 412893a1a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kfloppy-trinity.1
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility"
-.SH NAME
-kfloppy
-\- TDE Floppy Disk Utility
-.SH SYNOPSIS
-\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] 
-.SH DESCRIPTION
-\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks.
-.sp 1
-Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process.
-.sp 1
-\fBCaution\fP
-.br
-Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk.
-.sp 1
-\fBKfloppy\fP offers the following settings for floppy size:
-.RS 3
-.TP
-\- 3.5" 1.44MB
-.TP
-\- 3.5" 720KB
-.TP
-\- 5.25" 1.2MB
-.TP
-\- 5.25" 360KB
-.TP
-\- Auto-Detect
-.RE
-.sp 1
-\fBNote\fP
-.br
-The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion.
-.sp 1
-\fBKfloppy\fP supports the file systems DOS, ext2 and Minix.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B device
-Default device
-.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 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 
-.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 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kfloppy/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kfloppy/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kgpg-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kgpg-trinity.1
deleted file mode 100644
index 9ea82bb85..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kgpg-trinity.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH KGPG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG)
-.SH SYNOPSIS
-.B kgpg
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kgpg
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kgpg
-is a simple graphical interface for gpg (http://gnupg.org).
-Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. 
-.PP
-Kgpg can be used in different ways: 
-.IP "1 -" 4
-Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. 
-.IP "2 -" 4
-On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. 
-.IP "3 -" 4
-If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. 
-.SH OPTIONS
-.TP
-.B \-e
-encrypt file
-.TP
-.B \-s
-show encrypted file
-.TP
-.B \-S
-sign file
-.TP
-.B \-V
-verify signature
-.SS "Arguments:"
-.TP 12
-file
-file to open
-.SS "Generic options:"
-.TP 12
-.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\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-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
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-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
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-kgpg was written by
-.nh
-.ad l
-y0k0 <bj@altern.org>,
-.br
-.hy
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B Kgpg
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kgpg
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kgpg
-
diff --git a/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1
deleted file mode 100644
index 968d438f5..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor"
-.SH NAME
-khexedit
-\- TDE hex editor
-.SH SYNOPSIS
-\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] 
-.SH DESCRIPTION
-\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features.
-.sp 1
-When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu.
-.sp 1
-The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window.
-.sp 1
-The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text.
-.sp 1
-The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor.
-.sp 1
-Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active.
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   File(s) to open
-.SS Options:
-.TP
-.B  \-\-offset  <offset>
-Jump to 'offset'
-.SS 
-.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 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 
-.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 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/khexedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/khexedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Espen Sand <espensa@online.no>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kwikdisk-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
deleted file mode 100644
index 74aaad6ca..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility"
-.SH NAME
-kwikdisk
-\- TDE Free disk space utility
-.SH SYNOPSIS
-\fBkwikdisk\fB [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives.
-.sp 1
-\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space.
-.SH OPTIONS
-.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 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 
-.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
-
-.SH SEE ALSO
-\fBkdf\fP(1)
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-Espen Sand <espen@kde.org>
-.br
-Stanislav Karchebny <Stanislav.Karchebny@kdemail.net>
-.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/tdeutils/debian/man/superkaramba-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/superkaramba-trinity.1
deleted file mode 100644
index ab0ec0f49..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/superkaramba-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH SUPERKARAMBA 1 "juli  27, 2003"
-.SH NAME
-superkaramba \- a program based on karamba improving the eyecandy of TDE.
-.SH SYNOPSIS
-.B superkaramba
-[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B superkaramba
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.B Superkaramba
-is a tool based on karamba that allows anyone to easily create and run little
-interactive widgets on a Trinity desktop. Widgets are defined in a simple text file
-and can be augmented with Python code to make them interactive.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-help
-Show summary of 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 of program.
-.TP
-.B \-\-license
-Show license information
-.TP
-.B file
-A required argument 'file'
-.SH AUTHOR
-.B Superkaramba
-was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson
-<d98hk@efd.lth.se>.
-.PP
-This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/core/tdeutils/debian/man/tdefilereplace-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/tdefilereplace-trinity.1
deleted file mode 100644
index 63557c928..000000000
--- a/ubuntu/_base/core/tdeutils/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/tdeutils/debian/rules b/ubuntu/_base/core/tdeutils/debian/rules
index 6014293b3..455ebd769 100755
--- a/ubuntu/_base/core/tdeutils/debian/rules
+++ b/ubuntu/_base/core/tdeutils/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
@@ -33,9 +32,3 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini
 DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=tdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-binary-install/superkaramba-trinity::
-	rm -f debian/superkaramba/opt/trinity/share/doc/superkaramba/examples/globalMouse/xcursor.so
diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.examples b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.examples
deleted file mode 100644
index c02a032d2..000000000
--- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.examples
+++ /dev/null
@@ -1,12 +0,0 @@
-superkaramba/examples/API
-superkaramba/examples/autoHide
-superkaramba/examples/globalMouse
-superkaramba/examples/input_api
-superkaramba/examples/input_example
-superkaramba/examples/mouseDrag
-superkaramba/examples/popupMenu
-superkaramba/examples/README
-superkaramba/examples/richtext
-superkaramba/examples/taskBar
-superkaramba/examples/template.py
-superkaramba/examples/unicode
diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
index 8e4b39209..6304c3c0e 100644
--- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/bin/superkaramba
 debian/tmp/opt/trinity/share/applications/tde/superkaramba.desktop
 debian/tmp/opt/trinity/share/apps/superkaramba/superkarambaui.rc
+debian/tmp/opt/trinity/share/apps/superkaramba/examples
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.docbook
@@ -18,6 +19,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/superkaramba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/superkaramba.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+debian/tmp/opt/trinity/share/man/man1/superkaramba.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-superkaramba.desktop
 
 debian/icons/superkaramba.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages
deleted file mode 100644
index 730ac7f62..000000000
--- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/superkaramba-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/tdefilereplace-trinity.install b/ubuntu/_base/core/tdeutils/debian/tdefilereplace-trinity.install
index 515142b40..43a252535 100644
--- a/ubuntu/_base/core/tdeutils/debian/tdefilereplace-trinity.install
+++ b/ubuntu/_base/core/tdeutils/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/tdeutils/debian/tdefilereplace-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/tdefilereplace-trinity.manpages
deleted file mode 100644
index 694a538a0..000000000
--- a/ubuntu/_base/core/tdeutils/debian/tdefilereplace-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdefilereplace-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..666092455 100644
--- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
+++ b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
@@ -1,3 +1 @@
 tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst
deleted file mode 100644
index 9119d5017..000000000
--- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdelirc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdevelop/debian/cdbs/versions.pl b/ubuntu/_base/core/tdevelop/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdevelop/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdevelop/debian/compat b/ubuntu/_base/core/tdevelop/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdevelop/debian/compat
+++ b/ubuntu/_base/core/tdevelop/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdevelop/debian/control b/ubuntu/_base/core/tdevelop/debian/control
index cf3284fc7..d642c5e66 100644
--- a/ubuntu/_base/core/tdevelop/debian/control
+++ b/ubuntu/_base/core/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, tqt3-apps-dev, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake-trinity, ruby, python-all, g++, kdevdesigner-trinity
+Suggests: tqt3-apps-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity
 Description: An IDE for Unix/X11
  TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
diff --git a/ubuntu/_base/core/tdevelop/debian/rules b/ubuntu/_base/core/tdevelop/debian/rules
index 833ff7ecc..f53abacce 100755
--- a/ubuntu/_base/core/tdevelop/debian/rules
+++ b/ubuntu/_base/core/tdevelop/debian/rules
@@ -10,8 +10,7 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdevelop-trinity-dbg
 
diff --git a/ubuntu/_base/core/tdevelop/debian/watch b/ubuntu/_base/core/tdevelop/debian/watch
deleted file mode 100644
index 18344a41a..000000000
--- a/ubuntu/_base/core/tdevelop/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/core/tdewebdev/debian/cdbs/versions.pl b/ubuntu/_base/core/tdewebdev/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/core/tdewebdev/debian/compat b/ubuntu/_base/core/tdewebdev/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdewebdev/debian/compat
+++ b/ubuntu/_base/core/tdewebdev/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdewebdev/debian/control b/ubuntu/_base/core/tdewebdev/debian/control
index 81718eef4..cfd8d7810 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, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
@@ -13,7 +13,7 @@ Architecture: all
 Section: tde
 Replaces: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
-Depends: quanta-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
+Depends: quanta-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version})
 Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
 Description: web development apps from the official TDE release [Trinity]
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -166,25 +166,6 @@ Description: development files for Kommander [Trinity]
  This package is part of TDE, as a component of the TDE web development module.
  See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
-Package: kxsldbg-trinity
-Architecture: any
-Section: text
-Replaces: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
-Breaks: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Suggests: quanta-trinity, khelpcenter-trinity
-Description: graphical XSLT debugger for TDE [Trinity]
- KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
- interface as well as a text-based debugger. KXSLDbg can be run as a
- standalone application or as an embedded TDE part.
- .
- 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.
- .
- This package is part of TDE, as a component of the TDE web development module.
- See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
-
 Package: tdewebdev-trinity-dbg
 Section: libdevel
 Architecture: any
diff --git a/ubuntu/_base/core/tdewebdev/debian/copyright b/ubuntu/_base/core/tdewebdev/debian/copyright
index 9afb5f663..72a031f3f 100644
--- a/ubuntu/_base/core/tdewebdev/debian/copyright
+++ b/ubuntu/_base/core/tdewebdev/debian/copyright
@@ -17,7 +17,6 @@ Upstream Authors:
   Kommander: Marc Britton <consume@optusnet.com.au>,
       Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
       Andras Mantia <amantia@kde.org> and Trolltech
-  KXSLDbg: Keith Isdale <k_isdale@tpg.com.au>
 
 Quanta Plus is not in any way affiliated with any commercial versions of
 Quanta.  The primary coders from the original team left the GPL'd
diff --git a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian b/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian
deleted file mode 100644
index 447ce09a8..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-KXSLDbg for Debian
-------------------
-
-This application provides documentation in a docbook format that the TDE
-Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package tdewebdev-doc-html.
-
- -- Ben Burton <bab@debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
-
diff --git a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install
deleted file mode 100644
index 319e555c2..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install
+++ /dev/null
@@ -1,34 +0,0 @@
-debian/tmp/opt/trinity/bin/kxsldbg
-debian/tmp/opt/trinity/bin/xsldbg
-debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.la
-debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so
-debian/tmp/opt/trinity/share/applications/tde/kxsldbg.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/xsldbg.desktop
-debian/tmp/opt/trinity/share/apps/kxsldbg
-debian/tmp/opt/trinity/share/apps/kxsldbgpart
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png
-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/rules b/ubuntu/_base/core/tdewebdev/debian/rules
index b839eb381..7b4ee3cd9 100755
--- a/ubuntu/_base/core/tdewebdev/debian/rules
+++ b/ubuntu/_base/core/tdewebdev/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog
 DEB_INSTALL_CHANGELOGS_klinkstatus-trinity     := klinkstatus/ChangeLog
diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/akode/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/akode/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/akode/debian/compat b/ubuntu/_base/dependencies/akode/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/akode/debian/compat
+++ b/ubuntu/_base/dependencies/akode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index cbfa4bb85..0c757155f 100644
--- a/ubuntu/_base/dependencies/akode/debian/control
+++ b/ubuntu/_base/dependencies/akode/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: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
diff --git a/ubuntu/_base/dependencies/akode/debian/docs b/ubuntu/_base/dependencies/akode/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/dependencies/akode/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules
index 1788b4f36..aa92a8c09 100755
--- a/ubuntu/_base/dependencies/akode/debian/rules
+++ b/ubuntu/_base/dependencies/akode/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifeq (linux,$(DEB_HOST_ARCH_OS))
diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/arts/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/arts/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/arts/debian/compat b/ubuntu/_base/dependencies/arts/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/arts/debian/compat
+++ b/ubuntu/_base/dependencies/arts/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control
index 3edfdbd50..28f28f25a 100644
--- a/ubuntu/_base/dependencies/arts/debian/control
+++ b/ubuntu/_base/dependencies/arts/debian/control
@@ -4,11 +4,11 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
 Priority: optional
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
  docbook-to-man, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev,
- libogg-dev, libtqtinterface-dev,
+ libogg-dev, libtqt3-mt-dev,
  libvorbis-dev, libltdl-dev
 Build-Conflicts: libmas-dev
 Standards-Version: 3.8.4
@@ -18,7 +18,7 @@ Architecture: all
 Section: sound
 Replaces: arts-kde3 (<< 4:14.0.0~), arts-trinity (<< 4:14.0.0~)
 Breaks: arts-kde3 (<< 4:14.0.0~), arts-trinity (<< 4:14.0.0~)
-Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version})
+Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) | libarts1t64-trinity (>= ${source:Version})
 Description: sound system from the official TDE release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -58,7 +58,7 @@ Architecture: any
 Section: libdevel
 Replaces: libarts1-kde3-dev (<< 4:14.0.0~), libarts1-trinity-dev (<< 4:14.0.0~)
 Breaks: libarts1-kde3-dev (<< 4:14.0.0~), libarts1-trinity-dev (<< 4:14.0.0~)
-Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libglib2.0-dev, libogg-dev, libvorbis-dev, libmad0-dev, libtqtinterface-dev
+Depends: libarts1c2a-trinity (= ${binary:Version}), libartsc0-trinity-dev (= ${binary:Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libglib2.0-dev, libogg-dev, libvorbis-dev, libmad0-dev, libtqt3-mt-dev
 Description: development files for the aRts sound system core components
  This package contains the header files needed to build applications that
  use the aRts sound system.
diff --git a/ubuntu/_base/dependencies/arts/debian/docs b/ubuntu/_base/dependencies/arts/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/ubuntu/_base/dependencies/arts/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
index 856cad6c5..cfc14e7c5 100644
--- a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
@@ -60,3 +60,5 @@ debian/tmp/opt/trinity/lib/mcop/kmedia2.mcopclass
 debian/tmp/opt/trinity/lib/mcop/kmedia2.mcoptype
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcopclass
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcoptype
+debian/tmp/opt/trinity/share/man/man1/artscat-trinity.1
+debian/tmp/opt/trinity/share/man/man1/artsdsp-trinity.1
diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
deleted file mode 100644
index 8d7f5c573..000000000
--- a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/out/artscat-trinity.1
-debian/man/artsdsp-trinity.1
-
diff --git a/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
deleted file mode 100644
index cef6ee689..000000000
--- a/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/artsc-config-trinity.1
diff --git a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
index 125ebc39e..fcecb09b2 100644
--- a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -4,6 +4,7 @@ debian/tmp/opt/trinity/include/artsc/artsc_export.h
 debian/tmp/opt/trinity/lib/libartsc.la
 debian/tmp/opt/trinity/lib/libartsc.so
 debian/tmp/opt/trinity/lib/libartsgsl.a
+debian/tmp/opt/trinity/share/man/man1/artsc-config-trinity.1
 
 debian/tmp/usr/lib/pkgconfig/arts.pc
 debian/tmp/usr/lib/pkgconfig/artsc.pc
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (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.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (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.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (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.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (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.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules
index cc4893ca9..0871ce02f 100755
--- a/ubuntu/_base/dependencies/arts/debian/rules
+++ b/ubuntu/_base/dependencies/arts/debian/rules
@@ -9,8 +9,15 @@ endif
 export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= t64
+else
+DEB_TIME64_SUFFIX	= c2a
+endif
+
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -30,13 +37,13 @@ DEB_CMAKE_EXTRA_FLAGS := \
 
 DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg
 
-PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity
+PACKAGES_WITH_LIBS := libarts1$(DEB_TIME64_SUFFIX)-trinity libartsc0-trinity
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib)
 
-DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity	:= -V'libarts1c2a-trinity (>= 1.5.9)'
-DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity	:= -V'libartsc0-trinity (>= 1.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1$(DEB_TIME64_SUFFIX)-trinity	:= -V'libarts1$(DEB_TIME64_SUFFIX)-trinity (>= 1.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity			:= -V'libartsc0-trinity (>= 1.5.9)'
 
 #shlibs_ver = 1.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
@@ -47,3 +54,47 @@ binary-predeb/libarts1-trinity-dev::
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	    echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars
 endif
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libarts1c2a" | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libarts1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libarts1$(DEB_TIME64_SUFFIX)-" | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+	    -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+	    -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/compat b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control
index 171d4678e..86d9bb86f 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control
@@ -3,11 +3,11 @@ Section: net
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
-               cmake-trinity, ninja-build,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt,
+               tde-cmake, ninja-build,
                gcc,
                pkg-config,
-               libtqtinterface-dev,
+               libtqt3-mt-dev,
                libavahi-common-dev,
                libavahi-client-dev
 Standards-Version: 3.9.1
@@ -38,7 +38,7 @@ Replaces: libavahi-tqt-dev (<< 4:14.0.0~)
 Breaks: libavahi-tqt-dev (<< 4:14.0.0~)
 Depends: libavahi-tqt-1 (= ${binary:Version}),
          ${misc:Depends},
-         libtqtinterface-dev,
+         libtqt3-mt-dev,
          libavahi-common-dev
 Description: Development headers for the Avahi TQt integration library
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
index dc8f0248c..ea9c8dbd4 100755
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
index 451be956d..6bda799a7 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
 Section: devel
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libdbus-1-dev (>= 0.90)
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.3
 
@@ -11,7 +11,7 @@ Section: libdevel
 Architecture: any
 Replaces: libdbus-1-tqt-dev (<< 4:14.0.0~)
 Breaks: libdbus-1-tqt-dev (<< 4:14.0.0~)
-Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
+Depends: libdbus-1-tqt (= ${binary:Version}), libdbus-1-dev (>= 0.90), libtqt3-mt-dev
 Description: dbus bindings for the Trinity TQt interface
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
index 6621aaf1e..ea82ad554 100755
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_KDE_APIDOX := yes
 
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/changelog b/ubuntu/_base/dependencies/dbus-tqt/debian/changelog
deleted file mode 100644
index 91871211a..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-dbus-tqt (0.63.svn.0ubuntu0) maverick; urgency=low
-
-  * Migrate to Trinity Qt [TQt] Interface
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 23 Mar 2011 17:11:00 -0600
-
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-tqt/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control
deleted file mode 100644
index 68eab2d63..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/control
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: dbus-tqt
-Section: devel
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
-Standards-Version: 3.8.3
-
-Package: libdbus-tqt-1-1c2
-Section: libs
-Architecture: any
-Replaces: libdbus-tqt-1-1c2 (<< 4:14.0.0~)
-Breaks: libdbus-tqt-1-1c2 (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Conflicts: dbus-tqt-1, dbus-tqt-1c2, libdbus-tqt-1-1
-Description: simple interprocess messaging system (TQt-based shared library)
- D-BUS is a message bus, used for sending messages between applications.
- Conceptually, it fits somewhere in between raw sockets and CORBA in
- terms of complexity.
- .
- This package provides the TQt-based shared library for applications using the
- Qt interface to D-BUS.
- .
- See the dbus description for more information about D-BUS in general.
-
-Package: libdbus-tqt-1-dev
-Section: libdevel
-Architecture: any
-Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~)
-Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~)
-Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev
-Conflicts: dbus-tqt-1-dev
-Description: simple interprocess messaging system (TQt interface)
- D-BUS is a message bus, used for sending messages between applications.
- Conceptually, it fits somewhere in between raw sockets and CORBA in
- terms of complexity.
- .
- This package provides a TQt-style interface to D-BUS.
- .
- See the dbus description for more information about D-BUS in general.
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/copyright b/ubuntu/_base/dependencies/dbus-tqt/debian/copyright
deleted file mode 100644
index 9541c0a8f..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/copyright
+++ /dev/null
@@ -1,214 +0,0 @@
-This package was debianized by Colin Walters <walters@debian.org> on
-Thu,  6 Mar 2003 18:01:37 -0500
-
-The source tarball was created by splitting out the qt3 bindings part from the
-dbus-qt3 git repository: http://gitweb.freedesktop.org/?p=dbus/dbus-qt3.git
-
-This package is dual-licensed under the Academic Free License, and the
-GPL.  For a description of the GPL, see /usr/share/common-licenses/GPL
-on your Debian system.
-
-Portions of the package are only licensed under the GPL (notably 
-tools/dbus-cleanup-sockets.c and test/decode-gcov.c ).
-
-The Academic Free License follows:
-
-      The Academic Free License
-      v. 2.0
-
-This Academic Free License (the "License") applies to any original
-work of authorship (the "Original Work") whose owner (the "Licensor")
-has placed the following notice immediately following the copyright
-notice for the Original Work:
-
-Licensed under the Academic Free License version 2.0
-
-1) Grant of Copyright License. Licensor hereby grants You a
-world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
-license to do the following:
-
-a) to reproduce the Original Work in copies; 
-
-b) to prepare derivative works ("Derivative Works") based upon the Original Work; 
-
-c) to distribute copies of the Original Work and Derivative Works to the public; 
-
-d) to perform the Original Work publicly; and 
-
-e) to display the Original Work publicly.   
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license, under
-patent claims owned or controlled by the Licensor that are embodied in
-the Original Work as furnished by the Licensor, to make, use, sell and
-offer for sale the Original Work and Derivative Works.
-
-3) Grant of Source Code License. The term "Source Code" means the
-preferred form of the Original Work for making modifications to it and
-all available documentation describing how to modify the Original
-Work.  Licensor hereby agrees to provide a machine-readable copy of
-the Source Code of the Original Work along with each copy of the
-Original Work that Licensor distributes.  Licensor reserves the right
-to satisfy this obligation by placing a machine-readable copy of the
-Source Code in an information repository reasonably calculated to
-permit inexpensive and convenient access by You for as long as
-Licensor continues to distribute the Original Work, and by publishing
-the address of that information repository in a notice immediately
-following the copyright notice that applies to the Original Work.
-
-4) Exclusions From License Grant. Neither the names of Licensor, nor
-the names of any contributors to the Original Work, nor any of their
-trademarks or service marks, may be used to endorse or promote
-products derived from this Original Work without express prior written
-permission of the Licensor.  Nothing in this License shall be deemed
-to grant any rights to trademarks, copyrights, patents, trade secrets
-or any other intellectual property of Licensor except as expressly
-stated herein.  No patent license is granted to make, use, sell or
-offer to sell embodiments of any patent claims other than the licensed
-claims defined in Section 2.  No right is granted to the trademarks of
-Licensor even if such marks are included in the Original Work.
-Nothing in this License shall be interpreted to prohibit Licensor from
-licensing under different terms from this License any Original Work
-that Licensor otherwise would have a right to license.
-
-5) This section intentionally omitted.  
-
-6) Attribution Rights. You must retain, in the Source Code of any
-Derivative Works that You create, all copyright, patent or trademark
-notices from the Source Code of the Original Work, as well as any
-notices of licensing and any descriptive text identified therein as an
-"Attribution Notice."  You must cause the Source Code for any
-Derivative Works that You create to carry a prominent Attribution
-Notice reasonably calculated to inform recipients that You have
-modified the Original Work.
-
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor
-warrants that the copyright in and to the Original Work and the patent
-rights granted herein by Licensor are owned by the Licensor or are
-sublicensed to You under the terms of this License with the permission
-of the contributor(s) of those copyrights and patent rights.  Except
-as expressly stated in the immediately proceeding sentence, the
-Original Work is provided under this License on an "AS IS" BASIS and
-WITHOUT WARRANTY, either express or implied, including, without
-limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY
-OF THE ORIGINAL WORK IS WITH YOU.  This DISCLAIMER OF WARRANTY
-constitutes an essential part of this License.  No license to Original
-Work is granted hereunder except under this disclaimer.
-
-8) Limitation of Liability. Under no circumstances and under no legal
-theory, whether in tort (including negligence), contract, or
-otherwise, shall the Licensor be liable to any person for any direct,
-indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or the use of the
-Original Work including, without limitation, damages for loss of
-goodwill, work stoppage, computer failure or malfunction, or any and
-all other commercial damages or losses.  This limitation of liability
-shall not apply to liability for death or personal injury resulting
-from Licensor's negligence to the extent applicable law prohibits such
-limitation.  Some jurisdictions do not allow the exclusion or
-limitation of incidental or consequential damages, so this exclusion
-and limitation may not apply to You.
-
-9) Acceptance and Termination. If You distribute copies of the
-Original Work or a Derivative Work, You must make a reasonable effort
-under the circumstances to obtain the express assent of recipients to
-the terms of this License.  Nothing else but this License (or another
-written agreement between Licensor and You) grants You permission to
-create Derivative Works based upon the Original Work or to exercise
-any of the rights granted in Section 1 herein, and any attempt to do
-so except under the terms of this License (or another written
-agreement between Licensor and You) is expressly prohibited by
-U.S. copyright law, the equivalent laws of other countries, and by
-international treaty.  Therefore, by exercising any of the rights
-granted to You in Section 1 herein, You indicate Your acceptance of
-this License and all of its terms and conditions.
-
-10) Termination for Patent Action. This License shall terminate
-automatically and You may no longer exercise any of the rights granted
-to You by this License as of the date You commence an action,
-including a cross-claim or counterclaim, for patent infringement (i)
-against Licensor with respect to a patent applicable to software or
-(ii) against any entity with respect to a patent applicable to the
-Original Work (but excluding combinations of the Original Work with
-other software or hardware).
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating
-to this License may be brought only in the courts of a jurisdiction
-wherein the Licensor resides or in which Licensor conducts its primary
-business, and under the laws of that jurisdiction excluding its
-conflict-of-law provisions.  The application of the United Nations
-Convention on Contracts for the International Sale of Goods is
-expressly excluded.  Any use of the Original Work outside the scope of
-this License or after its termination shall be subject to the
-requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4
-101 et seq., the equivalent laws of other countries, and international
-treaty.  This section shall survive the termination of this License.
-
-12) Attorneys Fees. In any action to enforce the terms of this License
-or seeking damages relating thereto, the prevailing party shall be
-entitled to recover its costs and expenses, including, without
-limitation, reasonable attorneys' fees and costs incurred in
-connection with such action, including any appeal of such action.
-This section shall survive the termination of this License.
-
-13) Miscellaneous. This License represents the complete agreement
-concerning the subject matter hereof.  If any provision of this
-License is held to be unenforceable, such provision shall be reformed
-only to the extent necessary to make it enforceable.
-
-14) Definition of "You" in This License. "You" throughout this
-License, whether in upper or lower case, means an individual or a
-legal entity exercising rights under, and complying with all of the
-terms of, this License.  For legal entities, "You" includes any entity
-that controls, is controlled by, or is under common control with you.
-For purposes of this definition, "control" means (i) the power, direct
-or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (ii) ownership of fifty percent
-(50%) or more of the outstanding shares, or (iii) beneficial ownership
-of such entity.
-
-15) Right to Use. You may use the Original Work in all ways not
-otherwise restricted or conditioned by this License or by law, and
-Licensor promises not to interfere with or be responsible for such
-uses by You.
-
-This license is Copyright (C) 2003 Lawrence E. Rosen.  All rights
-reserved.  Permission is hereby granted to copy and distribute this
-license without modification.  This license may not be modified
-without the express written permission of its copyright owner.
-
--- 
-END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential 
-differences between the Academic Free License (AFL) version 1.0 and other 
-open source licenses:
-
-The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache 
-licenses in many respects but it is intended to solve a few problems with 
-those licenses.
-    
-* The AFL is written so as to make it clear what software is being 
-licensed (by the inclusion of a statement following the copyright notice 
-in the software). This way, the license functions better than a template 
-license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
-    
-* The AFL tqcontains a complete copyright grant to the software. The BSD 
-and Apache licenses are vague and incomplete in that respect.
-    
-* The AFL tqcontains a complete patent grant to the software. The BSD, MIT, 
-UoI/NCSA and Apache licenses rely on an implied patent license and contain 
-no explicit patent grant.
-    
-* The AFL makes it clear that no trademark rights are granted to the 
-licensor's trademarks. The Apache license tqcontains such a provision, but the 
-BSD, MIT and UoI/NCSA licenses do not.
-    
-* The AFL includes the warranty by the licensor that it either owns the 
-copyright or that it is distributing the software under a license. None of 
-the other licenses contain that warranty. All other warranties are disclaimed, 
-as is the case for the other licenses.
-
-* The AFL is itself copyrighted (with the right granted to copy and distribute 
-without modification). This ensures that the owner of the copyright to the 
-license will control changes. The Apache license tqcontains a copyright notice, 
-but the BSD, MIT and UoI/NCSA licenses do not. 
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
deleted file mode 100644
index bf44f3563..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libdbus-tqt-*.so.*
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
deleted file mode 100644
index 6ee3e25c3..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/usr/include/dbus*/dbus/dbus-qt.h
-debian/tmp/usr/include/dbus*/dbus/connection.h
-debian/tmp/usr/include/dbus*/dbus/server.h
-debian/tmp/usr/include/dbus*/dbus/message.h
-debian/tmp/usr/lib/libdbus-tqt-*.so
-debian/tmp/usr/lib/pkgconfig/*.pc
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules
deleted file mode 100755
index ff4a21c43..000000000
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-# Copyright © 2002,2003 Colin Walters <walters@verbum.org>
-# Copyright © 2003 Daniel Stone <daniels@debian.org>
-# Copyright © 2006 Sjoerd Simons <sjoerd@debian.org>
-
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include debian/cdbs/debian-tde.mk
-
-# Strict library versioning
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-
-# Build options
-DEB_CMAKE_EXTRA_FLAGS := \
- -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/compat b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/compat
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/control b/ubuntu/_base/dependencies/libart-lgpl/debian/control
index e53cbb5ae..ebf9b72d3 100644
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/control
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
 
 Package: libart-2.0-2
 Architecture: any
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules
index affcc25c7..8dcda8fda 100755
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/compat b/ubuntu/_base/dependencies/libcaldav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libcaldav/debian/compat
+++ b/ubuntu/_base/dependencies/libcaldav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control
index 6cdf8e7aa..00b867858 100644
--- a/ubuntu/_base/dependencies/libcaldav/debian/control
+++ b/ubuntu/_base/dependencies/libcaldav/debian/control
@@ -2,7 +2,7 @@ Source: libcaldav
 Section: graphics
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev
 Standards-Version: 3.8.3
 
 Package: libcaldav
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules
index e898aa6d2..899d31ee9 100755
--- a/ubuntu/_base/dependencies/libcaldav/debian/rules
+++ b/ubuntu/_base/dependencies/libcaldav/debian/rules
@@ -1,8 +1,15 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= 0t64
+else
+DEB_TIME64_SUFFIX	=
+endif
+
 
 ifdef DEB_HOST_MULTIARCH
   CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
@@ -18,3 +25,45 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_ALL_OPTIONS="ON" \
  -DBUILD_ALL="ON"
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libcaldav\." | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libcaldav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+	    -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+	    -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/compat b/ubuntu/_base/dependencies/libcarddav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/compat
+++ b/ubuntu/_base/dependencies/libcarddav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control
index cb394a2c6..454e1a847 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/control
+++ b/ubuntu/_base/dependencies/libcarddav/debian/control
@@ -2,7 +2,7 @@ Source: libcarddav
 Section: graphics
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: libcarddav
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules
index e898aa6d2..84d7be9bd 100755
--- a/ubuntu/_base/dependencies/libcarddav/debian/rules
+++ b/ubuntu/_base/dependencies/libcarddav/debian/rules
@@ -1,8 +1,15 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
+
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= 0t64
+else
+DEB_TIME64_SUFFIX	=
+endif
+
 
 ifdef DEB_HOST_MULTIARCH
   CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
@@ -18,3 +25,45 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_ALL_OPTIONS="ON" \
  -DBUILD_ALL="ON"
+
+post-patches::
+	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libcarddav\." | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libcarddav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+	    -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+endif
+
+clean::
+	dh_testdir
+	dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+	    -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/libr/debian/compat b/ubuntu/_base/dependencies/libr/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libr/debian/compat
+++ b/ubuntu/_base/dependencies/libr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control
index 121049451..1881d7fdf 100644
--- a/ubuntu/_base/dependencies/libr/debian/control
+++ b/ubuntu/_base/dependencies/libr/debian/control
@@ -1,12 +1,12 @@
 Source: libr
 Priority: extra
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libglade2-dev, binutils-dev, doxygen
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libgtk2.0-dev, binutils-dev, doxygen
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/
 
-Package: libr0
+Package: libr1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -16,6 +16,6 @@ Description: ELF binary resource library
 Package: libr-dev
 Section: libdevel
 Architecture: any
-Depends: libr0 (= ${binary:Version})
+Depends: libr1 (= ${binary:Version})
 Description: ELF binary resource library
  Store and retrieve resources from ELF binaries.
diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.dirs b/ubuntu/_base/dependencies/libr/debian/libr1.dirs
index 68457717b..68457717b 100644
--- a/ubuntu/_base/dependencies/libr/debian/libr0.dirs
+++ b/ubuntu/_base/dependencies/libr/debian/libr1.dirs
diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.install b/ubuntu/_base/dependencies/libr/debian/libr1.install
index d0dbfd18a..d0dbfd18a 100644
--- a/ubuntu/_base/dependencies/libr/debian/libr0.install
+++ b/ubuntu/_base/dependencies/libr/debian/libr1.install
diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules
index 72e752cf6..0b16c81e9 100755
--- a/ubuntu/_base/dependencies/libr/debian/rules
+++ b/ubuntu/_base/dependencies/libr/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 # Build options
 DEB_CMAKE_EXTRA_FLAGS := \
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/changelog b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+  * Port to TQt3 and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - fix annoying crash on shutdown. (Closes: #651815)
+
+  [ Felix Geyer ]
+  * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+    not overwritten.
+
+  [ Fathi Boudra ]
+  * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+  * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org>  Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch debian/rules engine to qt-kde-team/2/*.
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Remove dupe "Section" field from debian/control.
+  * Include verbatim BSD license to debian/copyright.
+  * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+  * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+  * Add myself to Uploaders.
+  * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+  * Add symbol file for libpolkit-qt-1-1.
+  * Update debian/copyright.
+
+  [ Didier Raboud ]
+  * Bump B-D of libpolkit to >= 0.98.
+
+  [ José Manuel Santamaría Lema ]
+  * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org>  Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org>  Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..617934820
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev,
+               libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1 | polkitd
+Description: PolicyKit-tqt library
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqt3-mt-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1 | polkitd
+Description: PolicyKit-tqt library example files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/copyright b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+    Dario Freddi <drf@kde.org>
+    Jaroslav Reznik <jreznik@redhat.com>
+    Radek Novacek <rnovacek@redhat.com>
+    Lukas Tinkl <ltinkl@redhat.com>
+    Pino Toscano <pino@kde.org>
+
+Copyright:
+
+    Copyright (C) 2008-2009 Daniel Nicoletti
+    Copyright (C) 2009-2010 Dario Freddi
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2009 Radek Novacek
+    Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+    Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+    Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+    Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+    Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/docs b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..c62056e98
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
+endif
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/format b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/options b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian
deleted file mode 100644
index 33603ec40..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian
+++ /dev/null
@@ -1,4 +0,0 @@
-DOCUMENTATION
--------------
-You can find doc and examples about PyTQt in the package python-tqt-doc
-
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/compat b/ubuntu/_base/dependencies/python-tqt/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
deleted file mode 100644
index ae635cbcd..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/sip/tqt
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
deleted file mode 100644
index 7b6aca191..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-sip/* usr/share/sip/tqt
-
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
deleted file mode 100644
index 36e6c1349..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ /dev/null
@@ -1,15 +0,0 @@
-# lintian test overriden as the files tripping this error are put into the source
-# of the generated package. This is a false-positive
-
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
-
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
deleted file mode 100644
index 43a4fa9fa..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/python-tqt-doc/html
-usr/share/doc/python-tqt-doc/examples
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
deleted file mode 100644
index 3162f69a8..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples3/*
-
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install
deleted file mode 100644
index 65f82036b..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
deleted file mode 100644
index 288f3cb88..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
deleted file mode 100644
index 61a9363d0..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
deleted file mode 100644
index 582be1bb1..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
deleted file mode 100644
index 7d27d0034..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/pylupdate.1
-debian/manpages/pyuic.1
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/watch b/ubuntu/_base/dependencies/python-tqt/debian/watch
deleted file mode 100644
index 506321d38..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.com/software/pyqt/download3 \
-       /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz
diff --git a/ubuntu/_base/dependencies/pytqt/debian/README.Debian b/ubuntu/_base/dependencies/pytqt/debian/README.Debian
new file mode 100644
index 000000000..201336f3a
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/README.Debian
@@ -0,0 +1,3 @@
+DOCUMENTATION
+-------------
+You can find doc and examples about PyTQt in the package pytqt-doc
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/changelog b/ubuntu/_base/dependencies/pytqt/debian/changelog
index 95e2f0cce..e834a6ca8 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/pytqt/debian/changelog
@@ -1,4 +1,4 @@
-python-tqt (3.18.1-4ubuntu0) lucid; urgency=low
+pytqt (3.18.1-4ubuntu0) lucid; urgency=low
 
   * Initial build
 
diff --git a/ubuntu/_base/dependencies/pytqt/debian/compat b/ubuntu/_base/dependencies/pytqt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/pytqt/debian/control
index 8af7946c1..60f732bb3 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/control
+++ b/ubuntu/_base/dependencies/pytqt/debian/control
@@ -1,20 +1,22 @@
-Source: python-tqt
+Source: pytqt
 Section: python
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python, python-all-dbg
+Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, libtqscintilla-dev, dh-python
 Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
 
-Package: python-tqt
+Package: python3-pytqt
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
-Replaces: python-tqt (<< 4:14.0.0~)
-Breaks: python-tqt (<< 4:14.0.0~)
-Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python:Provides}
-Description: TQt bindings for Python
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends}
+Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Replaces: python3-tqt
+Breaks: python3-tqt
+Description: TQt bindings for Python 3
  Python binding module that allows use of TQt X Window toolkit v3.
  You can use it to create portable graphics-capable scripts (there
  are PyTQt versions for Linux, Windows and MacOS X).
@@ -24,41 +26,41 @@ Description: TQt bindings for Python
  (types, etc), but usually you'll be able to write code pretty much the
  same way in both languages (with syntax differences, of course)
 
-Package: python-tqt-dbg
+Package: python3-pytqt-dbg
 Architecture: any
 Priority: extra
-Replaces: python-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-dbg (<< 4:14.0.0~)
 Section: debug
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python (debug extension)
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Replaces: python3-tqt-dbg
+Breaks: python3-tqt-dbg
+Description: TQt bindings for Python 3 (debug extension)
  Python binding module that allows use of TQt X Window toolkit v3.
  You can use it to create portable graphics-capable scripts (there
  are PyTQt versions for Linux, Windows and MacOS X).
  .
  This package contains the extension built for the Python debug interpreter.
 
-Package: python-tqt-gl
+Package: python3-pytqt-gl
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
-Replaces: python-tqt-gl (<< 4:14.0.0~)
-Breaks: python-tqt-gl (<< 4:14.0.0~)
-Suggests: python-tqt-doc
-Provides: ${python:Provides}
-Description: TQt OpenGL bindings for Python
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: pytqt-doc
+Provides: ${python3:Provides}
+Replaces: python3-tqt-gl
+Breaks: python3-tqt-gl
+Description: TQt OpenGL bindings for Python 3
  Python binding module that allows use of the OpenGL facilities
  offered by the TQt X Window toolkit v3. You can use it to create
  portable graphics-capable scripts (there are PyTQt versions for
  Linux, Windows and MacOS X).
 
-Package: python-tqt-gl-dbg
+Package: python3-pytqt-gl-dbg
 Priority: extra
 Section: debug
-Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
 Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python (debug extension)
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends}
+Replaces: python3-tqt-gl-dbg
+Breaks: python3-tqt-gl-dbg
+Description: TQt OpenGL bindings for Python 3 (debug extension)
  Python binding module that allows use of the OpenGL facilities
  offered by the TQt X Window toolkit v3. You can use it to create
  portable graphics-capable scripts (there are PyTQt versions for
@@ -66,29 +68,29 @@ Description: TQt OpenGL bindings for Python (debug extension)
  .
  This package contains the extension built for the Python debug interpreter.
 
-Package: python-tqtext
+Package: python3-pytqtext
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
-Replaces: python-tqtext (<< 4:14.0.0~)
-Breaks: python-tqtext (<< 4:14.0.0~)
-Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Replaces: python3-tqtext
+Breaks: python3-tqtext
 Description: TQt extensions for PyTQt
  PyTQt Extensions. Contains:
  .
-   * QScintilla: a featureful TQt source code editing component based
+   * TQScintilla: a featureful TQt source code editing component based
                  on Scintilla.
 
-Package: python-tqtext-dbg
+Package: python3-pytqtext-dbg
 Priority: extra
 Section: debug
-Replaces: python-tqtext-dbg (<< 4:14.0.0~)
-Breaks: python-tqtext-dbg (<< 4:14.0.0~)
 Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends}
+Replaces: python3-tqtext-dbg
+Breaks: python3-tqtext-dbg
 Description: TQt debug extensions for PyTQt
  PyTQt debug Extensions. Contains:
  .
-   * QScintilla: a featureful TQt source code editing component based
+   * TQScintilla: a featureful TQt source code editing component based
                  on Scintilla.
 
 Package: pytqt-tools
@@ -103,24 +105,24 @@ Description: pyuic and pylupdate for TQt
  pylupdate is the counterpart for TQt's lupdate. It updates TQt
  Linguist translation files from Python code.
 
-Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
-Replaces: python-tqt-dev (<< 4:14.0.0~)
-Breaks: python-tqt-dev (<< 4:14.0.0~)
+Package: pytqt-dev
+Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends}
+Suggests: python3-sip-tqt-dev, sip-tqt-dev
+Replaces: python-tqt-dev
+Breaks: python-tqt-dev
 Architecture: all
 Description: TQt bindings for Python - Development files
  Development .sip files with definitions of PyTQt classes. They
  are needed to build PyTQt, but also as building blocks of other
  packages based on them, like PyTDE.
 
-Package: python-tqt-doc
+Package: pytqt-doc
 Section: doc
 Architecture: all
-Replaces: python-tqt-doc (<< 4:14.0.0~)
-Breaks: python-tqt-doc (<< 4:14.0.0~)
+Replaces: python-tqt-doc
+Breaks: python-tqt-doc
 Depends: ${misc:Depends}
-Suggests: python-tqt
+Suggests: python3-pytqt
 Description: TQt bindings for Python - Documentation and examples
  Documentation and examples for the PyTQt (bindings that allow
  the use of TQt library from within a Python script).
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/copyright b/ubuntu/_base/dependencies/pytqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/pytqt/debian/copyright
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/docs b/ubuntu/_base/dependencies/pytqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/docs
+++ b/ubuntu/_base/dependencies/pytqt/debian/docs
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
index 4d2c8919a..9e68e9605 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
@@ -1,4 +1,4 @@
-.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
 .\"
 .\" Copyright 2001 Trolltech AS.  All rights reserved.
 .\" Copyright 2004 Ricardo Cardenes.  All rights reserved.
@@ -14,20 +14,20 @@
 .\" See http://www.trolltech.com/gpl/ for GPL licensing information.
 .\"
 .SH NAME
-pylupdate \- update Qt Linguist translation files from Python sources
+pytqlupdate \- update TQt Linguist translation files from Python sources
 .SH SYNOPSIS
-.B pylupdate
+.B pytqlupdate
 .RI "[ " options " ] " project-file...
 .SH DESCRIPTION
 This page documents the
-.B Qt Linguist Update
-tool for the Qt GUI toolkit, for Python source files.
-.B PyLupdate
-reads a qmake project file (.pro file), finds the translatable
+.B TQt Linguist Update
+tool for the TQt GUI toolkit, for Python source files.
+.B PyTQLupdate
+reads a tqmake project file (.pro file), finds the translatable
 strings in the specified source, header and interface files, and
 updates the translation files (.ts files) specified in it. The
 translation files are given to the translator who uses
-.B Qt Linguist
+.B TQt Linguist
 to read the files and insert the translations.
 .PP
 The .ts file format is a simple human-readable XML format that can be
@@ -66,15 +66,15 @@ TRANSLATIONS    = gnomovision_dk.ts \\
 .in -4
 .PP
 When running
-.B pylupdate
+.B pytqlupdate
 on this project file, the translatable strings in all the files
 listed in the SOURCES and FORMS entries will be put in
 the translation files listed in the TRANSLATIONS entry. Previous
 translations will be reused as far as possible, and translated
 strings that have vanished from the source files are marked obsolete.
 .SH "SEE ALSO"
-.BR lupdate (1),
-.BR lrelease (1)
+.BR tqlupdate (1),
+.BR tqlrelease (1)
 and
 .BR http://doc.trolltech.com/i18n.html
 .SH AUTHOR
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1
index f1ffa41ff..e456074a2 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1
@@ -1,26 +1,26 @@
-.TH pyuic 1 "25 June 2001" \" -*- nroff -*-
+.TH pytquic 1 "25 June 2001" \" -*- nroff -*-
 .SH NAME
-pyuic \- Qt user interface compiler for Python
+pytquic \- TQt user interface compiler for Python
 .SH SYNOPSIS
-.B pyuic
+.B pytquic
 [options] <uifile>
 .SH DESCRIPTION
 This page documents the
 .B Python User Interface Compiler
-for the Qt GUI application framework. The
-.B pyuic
-reads a user interface definition file (.ui) in XML as generated by Qt
+for the TQt GUI application framework. The
+.B pytquic
+reads a user interface definition file (.ui) in XML as generated by TQt
 Designer and creates corresponding Python module.
 .PP
 .PP
 Generate implementation:
 .br
-.I "\fB	pyuic [options] \fI<uifile>"
+.I "\fB	pytquic [options] \fI<uifile>"
 .br
 .PP
 Generate image collection:
 .br
-.I "\fB	pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
+.I "\fB	pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
 .br
         \fI<project>\fP:       project name
         \fI<image[1..n]>\fP:   image files
@@ -28,7 +28,7 @@ Generate image collection:
 .PP
 Generate subclass implementation:
 .br
-.I "\fB	pyuic [options] -subimpl <classname> \fI<uifile>"
+.I "\fB	pytquic [options] -subimpl <classname> \fI<uifile>"
 .br
         \fI<classname>\fP:      name of the subclass to generate
 .PP
@@ -57,13 +57,13 @@ Generate extra code to test the class
 Generate extra code to test but not display the class
 .TP
 .I -version
-Display version of pyuic
+Display version of pytquic
 .TP
 .I -help
 Display this information
 
 .SH "SEE ALSO"
-.BR uic (1)
+.BR tquic (1)
 
 .BR http://www.trolltech.com/
 
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/patches/series b/ubuntu/_base/dependencies/pytqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/pytqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
new file mode 100644
index 000000000..dd7cab0c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyTQt/tqtgl.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install
new file mode 100644
index 000000000..f18aeefd0
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/PyTQt/tqtcanvas.so
+usr/lib/python3*/*-packages/PyTQt/tqtnetwork.so
+usr/lib/python3*/*-packages/PyTQt/tqtsql.so
+usr/lib/python3*/*-packages/PyTQt/tqttable.so
+usr/lib/python3*/*-packages/PyTQt/tqtui.so
+usr/lib/python3*/*-packages/PyTQt/tqtxml.so
+usr/lib/python3*/*-packages/PyTQt/tqt.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install
new file mode 100644
index 000000000..511c1c0c4
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyTQt/tqtext.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs
new file mode 100644
index 000000000..735874a93
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs
@@ -0,0 +1 @@
+usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install
new file mode 100644
index 000000000..0f144be95
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install
@@ -0,0 +1 @@
+sip/* usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
new file mode 100644
index 000000000..1a3799d59
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
@@ -0,0 +1,14 @@
+# lintian test overriden as the files tripping this error are put into the source
+# of the generated package. This is a false-positive
+
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqt/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtaxcontainer/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtcanvas/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtext/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtgl/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtnetwork/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtpe/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtsql/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqttable/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtui/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtxml/copying.sip
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.dirs b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.dirs
new file mode 100644
index 000000000..8067955f9
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/pytqt-doc/html
+usr/share/doc/pytqt-doc/examples
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples
new file mode 100644
index 000000000..c48447a3e
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples
@@ -0,0 +1,2 @@
+examples/*
+
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install
new file mode 100644
index 000000000..273120f41
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install
@@ -0,0 +1 @@
+doc/PyTQt.html usr/share/doc/pytqt-doc/html
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
new file mode 100644
index 000000000..a8224067a
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
@@ -0,0 +1,2 @@
+debian/manpages/pytqlupdate.1
+debian/manpages/pytquic.1
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py b/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py
new file mode 100644
index 000000000..c25f1f56e
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py
@@ -0,0 +1,17 @@
+# import the pytqtconfig.py for the normal or the debug build
+
+import os
+import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages', 'PyTQt'))
+
+if 'd' in sys.abiflags:
+    try:
+        from pytqtconfig_d import *
+        from pytqtconfig_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named pytqtconfig; package python3-pytqt-dbg not installed')
+else:
+    from pytqtconfig_nd import *
+    from pytqtconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules
index 72a8d8dc0..0da3e5231 100755
--- a/ubuntu/_base/dependencies/python-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/pytqt/debian/rules
@@ -13,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
+export DEB_HOST_ARCH  		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export DH_OPTIONS
 
--include /usr/share/python/python.mk
+-include /usr/share/python3/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
 py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
@@ -24,7 +28,7 @@ py_libdir_sh = $(py_libdir)
 endif
 
 
-DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
+DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc
 INSTDIR=$(CURDIR)/debian
 
 export TQTDIR=/usr/share/tqt3
@@ -35,36 +39,28 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
 	CXXFLAGS += -O1
 endif
-CXXFLAGS += "-I/usr/include/tqt"
-
-PYTHONS	:= $(shell pyversions -vr debian/control)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+CXXFLAGS += "-I/usr/include/tqt" "-I/usr/include/tqt3"
 
+PYTHONS	:= $(shell py3versions -vr)
 
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
-	SPLIT=40
-else
-	SPLIT=10
-endif
+DEB_PARALLEL_JOBS ?= 40
 
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
 build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && echo yes \
                 | python$* ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \
                         -l /usr/include/python$* \
-                        -v /usr/share/sip/tqt \
+                        -v /usr/share/sip-tqt/tqt \
                         -m /usr/lib/python$*/config \
+                        -z \
                         CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
 	touch $@
 
@@ -73,13 +69,13 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && echo yes \
                 | python$*-dbg ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \
                         -l /usr/include/python$*_d \
-                        -v /usr/share/sip/tqt \
+                        -v /usr/share/sip-tqt/tqt \
                         -m /usr/lib/python$*/config_d \
+                        -z \
                         CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
 	touch $@
 
@@ -101,44 +97,48 @@ install-indep: configure
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
-	for version in ${PYTHONS}; do\
-		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-		mkdir -p debian/python-tqt-dev/$$pylib;\
-		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
+	for version in ${PYTHONS}; do \
+		pylibdev=debian/pytqt-dev/$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))")/dist-packages/PyTQt;\
+		mkdir -p $$pylibdev;\
+		install -m 644 -o root -g root build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_nd.py; \
+		install -m 644 -o root -g root dbg-build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_d.py; \
 	done
 	dh_install -i
+	mkdir -p debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt
+	install -m 644 -o root -g root debian/pytqtconfig_py3.py debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt/pytqtconfig.py
 
 install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k -a
 	dh_installdirs -a
-	for version in ${PYTHONS}; do \
-	  $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
-	done
-	for version in ${PYTHONS}; do \
-	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-	  $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
-	  mkdir -p debian/python-tqt/$$pylib;\
-	  cp -a debian/tmp/$$pylib/__init__.py \
-	        debian/python-tqt/$$pylib/__init__.py;\
-	  mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtgl.so \
-             debian/python-tqt-gl-dbg/$$pylib/;\
-	  mkdir -p debian/python-tqtext-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtext.so \
-             debian/python-tqtext-dbg/$$pylib/;\
+
+	for p in ${PYTHONS} ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
 	done
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
-	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+	for i in $$(find debian/python3-*-dbg -name '*.so'); do \
 	  b=$$(basename $$i .so); \
 	  mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-*-dbg ! -type d \
+	find debian/python3-*-dbg ! -type d \
                 ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
-	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+	find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg
+	mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+	cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \
+	      debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py
+	mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+	mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtgl.so \
+	   debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/
+	mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+	mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtext.so \
+	   debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/
 
 clean:
 	dh_testdir
@@ -161,7 +161,7 @@ binary-common:
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppytqt-tools
 	set -e; \
-	for p in python-tqt python-tqt-gl python-tqtext; do \
+	for p in python3-pytqt python3-pytqt-gl python3-pytqtext; do \
 	  DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
 	  rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	  ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
@@ -170,8 +170,8 @@ endif
 #	dh_strip
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
-	${DH_PYTHON2}
-	dh_sip_tqt
+	dh_python3 --no-dbg-cleaning
+	dh_py3sip_tqt
 	dh_lintian
 	dh_installdeb
 	dh_shlibdeps
diff --git a/ubuntu/_base/dependencies/pytqt/debian/source/format b/ubuntu/_base/dependencies/pytqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/pytqt/debian/source/options b/ubuntu/_base/dependencies/pytqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/compat b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index bdd8f4eb0..18f8cb9d2 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -4,60 +4,79 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev
+Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, python3-setuptools, dh-python, libtqt3-mt-dev, bison, flex
 Standards-Version: 3.8.4
 XS-Python-Version: all
+X-Python3-Version: >= 3.0
 
-Package: python-sip-tqt
+Package: python3-sip-tqt
 Architecture: any
 Section: python
-Replaces: python-sip-tqt (<< 4:14.0.0~)
-Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-tqt-api-7.1, sip-api-7.1
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4 (<< 4.10)
-Description: Python/C++ bindings generator runtime library
- SIP is a tool for generating bindings for C++ classes with some ideas
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
+ .
+ This package provides the SIP-TQt module for Python 3
 
-Package: python-sip-tqt-dbg
-Priority: extra
+Package: python3-sip-tqt-dev
+Architecture: any
+Section: python
+Depends: ${python3:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Description: Python/C++ bindings generator development files
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
+ has explicit support for the signal slot mechanism used by the TQt/TDE
+ class libraries.
+ .
+ Features:
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
+     - overloading virtual member functions with Python class methods
+     - protected member functions
+     - abstract classes
+     - enumerated types
+     - global class instances
+     - static member functions.
+ .
+ This package contains the code generator tool and the development headers
+ needed to develop Python 3 bindings with sip-tqt.
+
+Package: python3-sip-tqt-dbg
 Architecture: any
-Replaces: python-sip-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dbg (<< 4:14.0.0~)
 Section: debug
-Provides: ${python:Provides}
-Depends: python-sip-tqt (= ${binary:Version}), python-all-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4-dbg (<< 4.10)
-Description: Python/C++ bindings generator runtime library (debug extension)
- SIP is a tool for generating bindings for C++ classes with some ideas
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- This package contains the extension built for the Python debug interpreter.
+ This package provides the SIP-TQt module for the debug build of the Python 3.
 
-Package: python-sip-tqt-dev
+Package: sip-tqt-dev
 Architecture: any
 Section: python
-Replaces: python-sip-tqt-dev (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dev (<< 4:14.0.0~)
-Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python-sip-tqt (>= ${source:Version})
-Provides: python-sip-dev, python-sip4-dev, sip4
-Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Breaks: python-sip-tqt-dev (<< 4:14.1.0~)
+Recommends: python3-sip-tqt-dev
 Description: Python/C++ bindings generator development files
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- SIP was originally designed to generate Python bindings for TDE and so
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
  has explicit support for the signal slot mechanism used by the TQt/TDE
  class libraries.
  .
  Features:
-     - connecting Qt signals to Python functions and class methods
-     - connecting Python signals to Qt slots
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
      - overloading virtual member functions with Python class methods
      - protected member functions
      - abstract classes
@@ -65,6 +84,4 @@ Description: Python/C++ bindings generator development files
      - global class instances
      - static member functions.
  .
- This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip.
-
+ This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt.
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
new file mode 100644
index 000000000..a59025f15
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_py3sip_tqt>
+
+=head1 DESCRIPTION
+
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
+
+=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
deleted file mode 100644
index 3c6450bd9..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip_tqt - set the correct dependencies for Python packages using sip
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip_tqt>
-
-=head1 DESCRIPTION
-
-dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be
-used by Python extensions built with sip-tqt in order to depend on a version of
-python-sip-tqt that exports the correct public API.
-
-=cut
-
-init();
-
-my $sip_tqt_provides = `dpkg -s python-sip-tqt`;
-$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
-
-my $sip_tqt_api_version=$sip_tqt_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python-sip-tqt-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <shlomme@debian.org>
-
-=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
index ea429fe9a..8539600cf 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
@@ -123,27 +123,29 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_SIP_TQT 1"
-.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.IX Title "DH_PY3SIP_TQT 1"
+.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip
+dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBdh_sip_tqt\fR
+\&\fBdh_py3sip_tqt\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by
+Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
 that exports the correct public \s-1API\s0.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(7)
 .PP
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
 .SH "AUTHORS"
 .IX Header "AUTHORS"
 Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
 .\"
 .\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
 .\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
 .SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
 .SH SYNOPSIS
-.B sip
+.B sip-tqt
 [\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR]
 .SH DESCRIPTION
-.B sip
+.B sip-tqt
 takes a set of specification files and generates C++ code, documentation and build files.
 
 The format of the needed specification file is similar to a C++ header.
-sip includes run-time support for the generated code.
+sip-tqt includes run-time support for the generated code.
 .SH OPTIONS
 .TP
 .B \-h
 Show summary of options.
 .TP
 .B \-V
-Display the sip version number
+Display the sip-tqt version number
 .TP
 .B \-a file
 The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
 Always release and reaquire the GIL.
 .TP
 .B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
 .TP
 .B -j number
 Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ The suffix used for generated C or C++ files (".c" or ".cpp" if none specified)
 .TP
 .B -t tag
 The primary version to tag generate code for. You only can specify those
-defined with a %Timeline directive. If you don't specify one, sip
+defined with a %Timeline directive. If you don't specify one, sip-tqt
 will generate the latest available.
 .TP
 .B -w
@@ -80,7 +80,7 @@ The name of a file containing additional command line flags
 .TP
 .B file
 The name of the file containing the specification. If you skip it,
-sip will expect to be fed by stdin.
+sip-tqt will expect to be fed by stdin.
 .SH AUTHOR
 This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>,
 for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
index 0b31a69ff..e69de29bb 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
@@ -1,2 +0,0 @@
-# siputils_debian_changes.diff
-# siputils_objdir_module_fix.diff
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
deleted file mode 100644
index 2640f57c2..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org>
-Index: sip4-qt3-4.10/siputils.py
-===================================================================
---- sip4-qt3-4.10.orig/siputils.py	2010-01-14 15:52:09.000000000 +0100
-+++ sip4-qt3-4.10/siputils.py	2010-01-26 21:09:49.172700039 +0100
-@@ -718,7 +718,8 @@
- 
-         libs.extend(self.optional_list("LIBS_WINDOWS"))
- 
--        lflags.extend(self._platform_rpaths(rpaths.as_list()))
-+        # Don't append any rpaths
-+        #lflags.extend(self._platform_rpaths(rpaths.as_list()))
- 
-         # Save the transformed values.
-         self.CFLAGS.set(cflags)
-@@ -843,6 +844,15 @@
-         clib is the library name in cannonical form.
-         framework is set of the library is implemented as a MacOS framework.
-         """
-+        ##################################################################
-+        # Generally, the linker is intelligent enough not to need this   #
-+        # additional information!                                        #
-+        # And Qt4's pkg-config and prl files are broken                  #
-+        # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net>  #
-+        ##################################################################
-+
-+        return []
-+        
-         prl_libs = []
- 
-         if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
deleted file mode 100644
index 3c4570b21..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: b/siputils.py
-===================================================================
---- a/siputils.py
-+++ b/siputils.py
-@@ -1547,9 +1547,12 @@
-         mfile.write("\n$(OFILES): $(HFILES)\n")
- 
-         for mf in self._build["tqmoc_headers"].split():
--            root, discard = os.path.splitext(mf)
-+            root, _ = os.path.splitext(mf)
-             cpp = "tqmoc_" + root + ".cpp"
- 
-+            if self._src_dir != self.dir:
-+                mf = os.path.join(self._src_dir, mf)
-+
-             mfile.write("\n%s: %s\n" % (cpp, mf))
-             mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
- 
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
deleted file mode 100644
index 1df36c612..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
deleted file mode 100644
index fdd5af4cc..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
deleted file mode 100644
index ba33bb512..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/sip.1
-debian/manpages/dh_sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
deleted file mode 100644
index 9639c2814..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
index 416a453aa..416a453aa 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
new file mode 100644
index 000000000..8c6fee21f
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -0,0 +1 @@
+../dh_py3sip_tqt /usr/bin/
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
new file mode 100644
index 000000000..47086f7df
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
new file mode 100644
index 000000000..42f51bda1
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/dh_py3sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
new file mode 100644
index 000000000..5603520f7
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python3.*/*-packages/sip_tqt.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions b/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
deleted file mode 100644
index 57a7586e4..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.3-
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..c5f7ea68d 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -12,8 +12,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
+export DEB_HOST_ARCH  		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export DH_OPTIONS
 
+PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
+PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
+
 INSTDIR=$(CURDIR)/debian
 
 CFLAGS=
@@ -24,12 +31,9 @@ else
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS	:= $(shell pyversions -vr debian/control)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+PYTHONS := $(shell py3versions -vr)
 
--include /usr/share/python/python.mk
+-include /usr/share/python3/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
 py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
@@ -47,8 +51,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -57,9 +60,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
-			-e /usr/include/python$*_d \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
 
@@ -81,12 +82,13 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
-	dh_clean
+	dh_clean debian/python3-sip.pydist
 
 install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_prep -a
+	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
@@ -97,31 +99,29 @@ install-arch: build
 		$(MAKE) -f debian/rules install-arch-$$p;\
 	done
 
-	for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \
+	for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
-	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
+	find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+	find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin
-
-install-arch-%:
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
-	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
-	touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
-	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
-	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
-	ln -s ../python$*/sip.h \
-	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
-	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
-	install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/
+	install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py
+	install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py
+	install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py
+	mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')
+	install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/
+	mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')
+	ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \
+	    debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h
+	mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
+	install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
 
 
 # Must not depend on anything. This is to be called by
@@ -137,19 +137,15 @@ binary-common:
 	dh_link
 # don't call strip twice, it's in binary-common
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
-	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
-	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
-	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
-	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
+	rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
+	ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 endif
-	dh_compress 
+	dh_compress -X.inv
 	dh_fixperms
-ifneq (dh_pysupport,${DH_PYTHON2})
-	${DH_PYTHON2} --no-dbg-cleaning
-else
-	${DH_PYTHON2}
-endif
+	dh_python3 --no-dbg-cleaning
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -165,4 +161,4 @@ binary-arch: install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary configure
+.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
new file mode 100644
index 000000000..07438bc04
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
@@ -0,0 +1 @@
+usr/bin/sip-tqt
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
new file mode 100644
index 000000000..1570b539a
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/sip-tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
new file mode 100644
index 000000000..a937df69a
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -0,0 +1,17 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import os
+import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages'))
+
+if 'd' in sys.abiflags:
+    try:
+        from sip_tqt_config_d import *
+        from sip_tqt_config_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named sip_tqt_config; package python-sip-tqt-dbg not installed')
+else:
+    from sip_tqt_config_nd import *
+    from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
-    try:
-        from sipconfig_d import *
-        from sipconfig_d import _pkg_config, _default_macros
-    except ImportError, msg:
-        raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
-else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/watch b/ubuntu/_base/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
-      /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..ded0cfa99 100644
--- a/ubuntu/_base/common/cmake/debian/cdbs/cmake-versions.pl
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
@@ -3,17 +3,21 @@
 use strict;
 use warnings;
 
+# Get real cmake version and package version prefix
 my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`;
+my $packageversion = `dpkg-query -W -f='\${Version}' cmake`;
+my ($prefix);
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
+($prefix = $packageversion) =~ s/$version.*//;
 ($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "CMake-Version3=$version3\n";
-print "CMake-Version2=$version2\n";
-print "CMake-Next-Version3=$version3_next\n";
-print "CMake-Next-Version2=$version2_next\n";
+print "CMake-Version3=$prefix$version3\n";
+print "CMake-Version2=$prefix$version2\n";
+print "CMake-Next-Version3=$prefix$version3_next\n";
+print "CMake-Next-Version2=$prefix$version2_next\n";
diff --git a/ubuntu/_base/common/cmake/debian/changelog b/ubuntu/_base/dependencies/tde-cmake/debian/changelog
index a5303f852..368e8ed98 100644
--- a/ubuntu/_base/common/cmake/debian/changelog
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/changelog
@@ -1,3 +1,9 @@
+tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low
+
+  * Move from common submodule to dependencies.
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Fri, 13 Jan 2023 15:36:28 +0100
+
 cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low
 
   * Initial release as a standalone package.
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/compat b/ubuntu/_base/dependencies/tde-cmake/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/common/cmake/debian/control b/ubuntu/_base/dependencies/tde-cmake/debian/control
index 1363e01ee..89e639c24 100644
--- a/ubuntu/_base/common/cmake/debian/control
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/control
@@ -1,13 +1,16 @@
-Source: cmake-trinity
+Source: tde-cmake
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, cmake (>= 3.10~)
 Standards-Version: 3.8.4
 
-Package: cmake-trinity
+Package: tde-cmake
 Architecture: all
 Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl
+Replaces: cmake-trinity (<< 4:14.1.0~)
+Breaks: cmake-trinity (<< 4:14.1.0~)
+Provides: cmake-trinity
 Description: TDE CMake modules
  TDE uses its own set of modules and macros to simplify CMake rules.
  .
diff --git a/ubuntu/_base/common/cmake/debian/copyright b/ubuntu/_base/dependencies/tde-cmake/debian/copyright
index 82d825030..82d825030 100644
--- a/ubuntu/_base/common/cmake/debian/copyright
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/copyright
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/patches/series b/ubuntu/_base/dependencies/tde-cmake/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/patches/series
diff --git a/ubuntu/_base/common/cmake/debian/rules b/ubuntu/_base/dependencies/tde-cmake/debian/rules
index 95a42b3f7..615a177d0 100755
--- a/ubuntu/_base/common/cmake/debian/rules
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/source/format b/ubuntu/_base/dependencies/tde-cmake/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/source/options b/ubuntu/_base/dependencies/tde-cmake/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/tqca/debian/compat b/ubuntu/_base/dependencies/tqca/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqca/debian/compat
+++ b/ubuntu/_base/dependencies/tqca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqca/debian/control b/ubuntu/_base/dependencies/tqca/debian/control
index 7da73e73c..2afcbac0d 100644
--- a/ubuntu/_base/dependencies/tqca/debian/control
+++ b/ubuntu/_base/dependencies/tqca/debian/control
@@ -2,7 +2,7 @@ Source: tqca
 Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: libtqca
@@ -17,7 +17,7 @@ Package: libtqca-dev
 Architecture: any
 Multi-Arch: foreign
 Section: libdevel
-Depends: libtqca (= ${binary:Version}), libtqtinterface-dev
+Depends: libtqca (= ${binary:Version}), libtqt3-mt-dev
 Description:
  libtqca provides TQt interface for security plugins
  .
diff --git a/ubuntu/_base/dependencies/tqca/debian/rules b/ubuntu/_base/dependencies/tqca/debian/rules
index bcf875516..63b656615 100755
--- a/ubuntu/_base/dependencies/tqca/debian/rules
+++ b/ubuntu/_base/dependencies/tqca/debian/rules
@@ -1,8 +1,7 @@
 #! /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
+-include /usr/share/cdbs/1/class/tde.mk
 
 ifdef DEB_HOST_MULTIARCH
   CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/compat b/ubuntu/_base/dependencies/tqscintilla/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/compat
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control
index e89abba2a..c6a33c3c5 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/control
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqt3-mt-dev
 Standards-Version: 3.8.4
 
 Package: libtqscintilla7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Replaces: libtqscintilla7 (<< 4:14.0.0~)
 Breaks: libtqscintilla7 (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
 Description: TQt source code editing component based on Scintilla
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
  .
  TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
 Package: libtqscintilla-dev
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: foreign
 Replaces: libtqscintilla-dev (<< 4:14.0.0~)
 Breaks: libtqscintilla-dev (<< 4:14.0.0~)
 Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
 Package: libtqscintilla-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Replaces: libtqscintilla-doc (<< 4:14.0.0~)
 Breaks: libtqscintilla-doc (<< 4:14.0.0~)
 Suggests: libtqscintilla-dev
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/dirs b/ubuntu/_base/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/ubuntu/_base/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/docs b/ubuntu/_base/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/docs
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
 NEWS
+README
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..8a9449faa 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
 usr/include
-usr/lib/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..b3c140659 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/lib/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules
index e87355584..63b656615 100755
--- a/ubuntu/_base/dependencies/tqscintilla/debian/rules
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules
@@ -1,117 +1,19 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
 endif
 
-# This is the debhelper compatibility version to use.
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
-TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
-	cd designer; qmake
-	touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	install -d $(CURDIR)/tmplib
-	$(MAKE) -C qt
-	$(MAKE) -C designer
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f qt/Makefile ] || $(MAKE) -C qt clean
-	[ ! -f designer/Makefile ] || $(MAKE) -C designer clean
-	-find -name 'Makefile' -exec rm {} \;
-	-rm -rf tmplib
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -d $(HEADERDEST)/private
-	install -d $(DOCDEST)
-	install -d $(TRANSDEST)
-	install -d $(LIBSDEST)
-	install -d $(PLUGINDEST)
-	for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
-	for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
-	for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
-	for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
-	mv designer/*.so $(PLUGINDEST)
-	for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -V
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt/debian/README.Debian
index e48fe37ea..86b633251 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/README.Debian
+++ b/ubuntu/_base/dependencies/tqt/debian/README.Debian
@@ -5,92 +5,92 @@ Qt for Debian README
 
 This README is intended to give developers and users exact information
 about how the qt-x11-free package provided by TrollTech AS has been packaged
-for Debian in case you either want to faciliate it for development 
-of applications and libraries or plugins using the Qt class library. With 
-qt-x11-3.1.1, the Debian packages have been massively restructured to get 
-the most out of theoriginal Qt package and spit the contents up into 
-several packages so that they make the most sensefor several groups of 
-users; developers, application users, translators of Qt-based 
-applications and Debian packagers who are packaging applications developed 
-with Qt.2. 
+for Debian in case you either want to faciliate it for development
+of applications and libraries or plugins using the Qt class library. With
+qt-x11-3.1.1, the Debian packages have been massively restructured to get
+the most out of theoriginal Qt package and spit the contents up into
+several packages so that they make the most sensefor several groups of
+users; developers, application users, translators of Qt-based
+applications and Debian packagers who are packaging applications developed
+with Qt.2.
 
 2. General Overview
 
-As Qt is a huge package that contains a complete environment for 
-developers, it needs to be split up into several packages that make it 
-easier for everyone else to handle it and not to retquire 
-unnecessary disk space for end-users. Additionally, Qt can be configured 
-in several ways - and therefore also used in several ways. Qt development 
-usually retquires the environment variable QTDIR. As Debian is placing 
-libraries and header files in a tquite specific filesystem order, this 
-usually breaks setting a single environment variable to meet the 
-retquirements of packages. Therefore, symlinks are used to set up the system 
-to meet both, the Debian filesystem standard and the QTDIR variable. All of 
-Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set 
+As Qt is a huge package that contains a complete environment for
+developers, it needs to be split up into several packages that make it
+easier for everyone else to handle it and not to retquire
+unnecessary disk space for end-users. Additionally, Qt can be configured
+in several ways - and therefore also used in several ways. Qt development
+usually retquires the environment variable QTDIR. As Debian is placing
+libraries and header files in a tquite specific filesystem order, this
+usually breaks setting a single environment variable to meet the
+retquirements of packages. Therefore, symlinks are used to set up the system
+to meet both, the Debian filesystem standard and the QTDIR variable. All of
+Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set
 QTDIR, do export QTDIR=/usr/share/tqt3
 
-As far as the common build configuration goes, we note explicitely that the 
-Debian package of Qt will in very rare cases break the compilation (most 
-likely the linking) of applications on Debian which use Qt, in particular 
-utilizing styles in an incorrect way by deriving from one of the styles 
-that ship with Qt. In case you are a Debian packager and encounter 
+As far as the common build configuration goes, we note explicitely that the
+Debian package of Qt will in very rare cases break the compilation (most
+likely the linking) of applications on Debian which use Qt, in particular
+utilizing styles in an incorrect way by deriving from one of the styles
+that ship with Qt. In case you are a Debian packager and encounter
 problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
-We will tell you why things don't work and what you should communicate on 
-with the programmers of your application that you are packaging. The build 
-configuration generally is intended to provide a Qt version that is as 
-small as possible in terms of the memory size it retquires. Therefore, 
-everything inside Qt that can be compiled as plugins has been compiled that 
-way. This includes: 
-
-- imageformats: jpeg and mng - codecs (for languages like arab, japanese 
-  etc provided with Qt) 
+We will tell you why things don't work and what you should communicate on
+with the programmers of your application that you are packaging. The build
+configuration generally is intended to provide a Qt version that is as
+small as possible in terms of the memory size it retquires. Therefore,
+everything inside Qt that can be compiled as plugins has been compiled that
+way. This includes:
+
+- imageformats: jpeg and mng - codecs (for languages like arab, japanese
+  etc provided with Qt)
 - sql drivers for databases (MySQL, ODBC and PostgreSQL)
 
-The only exception is the imageformat png which has been compiled built-in 
-due to the fact that there is literally no program that uses no icons at 
-all and icons are to be used preferrably in png format. The plugins are all 
+The only exception is the imageformat png which has been compiled built-in
+due to the fact that there is literally no program that uses no icons at
+all and icons are to be used preferrably in png format. The plugins are all
 located under /usr/lib/tqt3/plugins. This is also the install location you
-should choose as a package maintainer for 
-qt-plugins so the user doesn't have to customize his library path for 
-loading Qt plugins. The only exception is that KDE delivers a set of Qt 
-plugins as well (mainly styles and designer plugins); those are placed in 
-/usr/lib/trinity/plugins. 
-
-QMotif Extension: As this code is only available in commercial environments 
-(and produces a static library libqmotif.a anyway that those commercial 
-applications have to be linked against in addition to Qt), we left out all 
-header files of the libtqt3-headers package that are belonging to this 
+should choose as a package maintainer for
+qt-plugins so the user doesn't have to customize his library path for
+loading Qt plugins. The only exception is that KDE delivers a set of Qt
+plugins as well (mainly styles and designer plugins); those are placed in
+/usr/lib/trinity/plugins.
+
+QMotif Extension: As this code is only available in commercial environments
+(and produces a static library libqmotif.a anyway that those commercial
+applications have to be linked against in addition to Qt), we left out all
+header files of the libtqt3-headers package that are belonging to this
 QMotif extension.
 
-Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers 
-are only available in a commercial version of Qt due to license 
-incompatibilities with the GPL. If you need to faciliate those drivers, 
-please visit http://www.trolltech.com and have a read at 
+Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers
+are only available in a commercial version of Qt due to license
+incompatibilities with the GPL. If you need to faciliate those drivers,
+please visit http://www.trolltech.com and have a read at
 http://doc.trolltech.com/3.0/sql-driver.html.
-  
-3. Packages (End-User) 
 
-The Qt built has been split up into several packages that allow for easy 
-installation for all types of users. The End-user usually only retquires to 
-have the following packages installed to run an application that links 
+3. Packages (End-User)
+
+The Qt built has been split up into several packages that allow for easy
+installation for all types of users. The End-user usually only retquires to
+have the following packages installed to run an application that links
 against Qt:
 
-Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for 
+Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for
 loading designer-made user interfaces at runtime).
 
 Optionally depending on the program's retquirements:
 
 libtqt3-mt-odbc
 libtqt3-mt-mysql
-libtqt3-mt-psql 
+libtqt3-mt-psql
 
-In addition to the libraries, it may make sense to install the program 
-qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
-installed, the KDE control center will take this task automatically in most 
+In addition to the libraries, it may make sense to install the program
+qtconfig to customize the look and behaviorof Qt programs. If you have KDE
+installed, the KDE control center will take this task automatically in most
 cases. qtconfig is available in the package tqt3-qtconfig.
 
-Also, Qt programs can make use of the online-help tool that ships with Qt, 
-the Qt Assistant. The Assistant can be installed with the package 
+Also, Qt programs can make use of the online-help tool that ships with Qt,
+the Qt Assistant. The Assistant can be installed with the package
 qt3-assistant.
 
 Qt Configuration files
@@ -104,82 +104,80 @@ assistant as well as qtconfig.
 
 4. Packages (Package maintainers)
 
-In addition to the library, a package maintainer will retquire an additional 
-set of packages to compile a package that retquires Qt. Depending on the 
-version of the qt library, you will retquire a different set of packages; 
-the most common option should be to make your application link against the 
-multi-threaded version (-mt).Packages necessary for compiling Qt 
+In addition to the library, a package maintainer will retquire an additional
+set of packages to compile a package that retquires Qt. Depending on the
+version of the qt library, you will retquire a different set of packages;
+the most common option should be to make your application link against the
+multi-threaded version (-mt).Packages necessary for compiling Qt
 applications from source:
 
-libtqt3-mt-dev   (use libtqt3-dev for linking against -lqt, this package only 
+libtqt3-mt-dev   (use libtqt3-dev for linking against -ltqt, this package only
                 contains the .so files and the header file for libtqui.so)
 
-libtqt3-headers  (header files for libqt and libtqt-mt)
- 
-qt3-dev-tools  (this package contains the tools uic and moc as well as 
-qmake, retquired for building Qt applications) 
+libtqt3-headers  (header files for libtqt and libtqt-mt)
+
+tqt3-dev-tools  (this package contains the tools tquic and tqmoc as well as
+tqmake, required for building TQt applications)
 
-If, however, you encounter an older program not to compile with this set 
+If, however, you encounter an older program not to compile with this set
 read the FAQ at the end of this document.
 
 5. Packages (Developers)
 
-In addition to the packages that packagers retquire, a developer usually 
-will retquire the Qt API documentationas well as tools like the assistant, 
-linguist or designer. However, you should be fine with installing the API 
-documentation that you can browse with a webbrowser, optionally with the 
+In addition to the packages that packagers retquire, a developer usually
+will retquire the Qt API documentationas well as tools like the assistant,
+linguist or designer. However, you should be fine with installing the API
+documentation that you can browse with a webbrowser, optionally with the
 assistant. They are available in /usr/share/doc/tqt3-doc/html.
 For a regular development environment, install tqt3-designer and tqt3-doc.
 
-For faciliating Qt's extended environment to write plugins for the Qt 
-Designer or extend the Designer as well as utilizing the Qt Assistant by 
+For faciliating Qt's extended environment to write plugins for the Qt
+Designer or extend the Designer as well as utilizing the Qt Assistant by
 calling it from within your program, install tqt3-apps-dev, which contains
 the static libraries and header files retquired for this functionality.
 
-For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and 
-maketqpf (embedded fonts tool)have been packaged into 
-qt3-dev-tools-embedded. For developers that work on migrating their program 
-from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find 
+For developers that work on migrating their program
+from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find
 additional tools in the tqt3-dev-tools-compat.
 
-For using the QTranslator class and where to find the qm-file for qt as 
+For using the QTranslator class and where to find the qm-file for qt as
 well as where to place your translations,see the next section.
 
-If your program doesn't compile with those settings in case you have 
-started your project with Qt 1.x or 2.x, please read the FAQ section at the 
+If your program doesn't compile with those settings in case you have
+started your project with Qt 1.x or 2.x, please read the FAQ section at the
 end of this document.
 
 5. Packages (Translators)
 
-In order to translate a Qt program into any other language, the Qt 3 way to 
-do this is to let the developer create a ts-file containing the strings 
-that the program exposes on the user interface. The tools to create the 
-ts-file and to create the final qm (Q-message binary) file, lupdate and 
-lrelease, are included in tqt3-dev-tools.The single translator that only 
-gets provided the ts file and has to return a translated ts file, it 
-is absolutely enough to install tqt3-linguist; the package tqt3-assistant can 
+In order to translate a Qt program into any other language, the Qt 3 way to
+do this is to let the developer create a ts-file containing the strings
+that the program exposes on the user interface. The tools to create the
+ts-file and to create the final qm (Q-message binary) file, lupdate and
+lrelease, are included in tqt3-dev-tools.The single translator that only
+gets provided the ts file and has to return a translated ts file, it
+is absolutely enough to install tqt3-linguist; the package tqt3-assistant can
 be installed to access the online-help for the Qt Linguist itself.
-In case you're converting an application using Qt prior to Qt 3, you may 
-want to uitilize the tqt3-dev-tools-compat which include the necessary tools 
+In case you're converting an application using Qt prior to Qt 3, you may
+want to uitilize the tqt3-dev-tools-compat which include the necessary tools
 to convert older qm files to the new ts file standard.
 
-Locations of message translations: 
+Locations of message translations:
 
-Qt ships with a set of translations for the strings used inside Qt. Those 
-translations will be installed into /usr/share/tqt3/translations (qm files 
-only), which equals $QTDIR/translations respectively 
-qInstallPath() + QString( "/translations" ). 
+Qt ships with a set of translations for the strings used inside Qt. Those
+translations will be installed into /usr/share/tqt3/translations (qm files
+only), which equals $QTDIR/translations respectively
+qInstallPath() + QString( "/translations" ).
 
 The configure option --translationdir has been set to /usr/share/tqt3/translations
-accordingly since it was introduced in Qt 3.2. 
+accordingly since it was introduced in Qt 3.2.
 
-To correctly enable your program to display the translations to the Qt 
-library and to load the translation of the program itself, we currently 
-suggest to either install your translations along with any other data files 
-into/usr/share/<appname>/, translation files into the subdirectory 
-translations (that is /usr/share/<appname>/translations) The code that your 
-application should use to load the Qt translation will have to look like 
-the following:    
+To correctly enable your program to display the translations to the Qt
+library and to load the translation of the program itself, we currently
+suggest to either install your translations along with any other data files
+into/usr/share/<appname>/, translation files into the subdirectory
+translations (that is /usr/share/<appname>/translations) The code that your
+application should use to load the Qt translation will have to look like
+the following:
 
 int main( int argc, char **argv )
     {
@@ -187,89 +185,69 @@ int main( int argc, char **argv )
 
         // translation file for Qt
         QTranslator qt( 0 );
-        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + 
+        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() +
         QString( "/translations" );
         app.installTranslator( &qt );
 
         // translation file for application strings
         QTranslator myapp( 0 );
-        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); 
-        // use a substitue for $prefix/share/appname/translations here      
+        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." );
+        // use a substitue for $prefix/share/appname/translations here
         app.installTranslator( &myapp );
 
 6. Frequently Asked Questions
 
-Using Qt for Debian as a developer or packager 
+Using Qt for Debian as a developer or packager
 ----------------------------------------------
 
-Q: I want to compile a source package that utilizes qmake to build the 
+Q: I want to compile a source package that utilizes qmake to build the
 Makefiles. What do I need to do to makeit work ?
 
-A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. 
+A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC.
 To make it work, do
 export QTDIR=/usr/share/tqt3
 export QMAKESPEC=linux-g++
 
 Then run qmake -o Makefile <projectfile>.pro
 
-After that, the Makefile is correctly created to build your application on 
-Debian. As a packager, export thosetwo variables in the rules file before 
+After that, the Makefile is correctly created to build your application on
+Debian. As a packager, export thosetwo variables in the rules file before
 calling qmake.
 
-Q: I have an application that when linking gives me symbol referencing 
+Q: I have an application that when linking gives me symbol referencing
 errors to Q*Style. Why does my applicationnot link correctly ?
 
-A: The author of the program is using the styles that ship with Qt directly 
-instead of using the QStylePlugin interface.If you are the author of the 
-program, change your program to use QStylePlugin. If you are a packager, 
-write to theauthor of the program that he is assuming that the styles 
-shipped with Qt are built-in to the library which is not the case on Debian 
+A: The author of the program is using the styles that ship with Qt directly
+instead of using the QStylePlugin interface.If you are the author of the
+program, change your program to use QStylePlugin. If you are a packager,
+write to theauthor of the program that he is assuming that the styles
+shipped with Qt are built-in to the library which is not the case on Debian
 and that he please should fix this and use QStylePlugin.
 
 Q: Where are all the examples and tutorials ? And how do I build them ?
 
-A: Qt ships with examples and tutorials; so does the Linguist and Designer. 
-The tutorials and examples are compressed tarballs which you can unpack with 
+A: Qt ships with examples and tutorials; so does the Linguist and Designer.
+The tutorials and examples are compressed tarballs which you can unpack with
 tar -zxvf into your home directory. Change into the tqt3-examples directory
 and run the provided ./build-examples script. All Qt examples and tutorials,
 including those for designer and the linguist, will be compiled. You will
 notice however, that those examples that inherit from style classes which
 are not built-in into Qt but configured as a plugin will not compile due
-to the fact that they can't link to the Qt library. 
+to the fact that they can't link to the Qt library.
 
-Q: I'm writing a pure Qt application and I want to ship it with a default 
-configuration file. Where does that global configuration file go if I make 
-use of the QSettings class ? 
+Q: I'm writing a pure Qt application and I want to ship it with a default
+configuration file. Where does that global configuration file go if I make
+use of the QSettings class ?
 
 A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
 --sysconfdir which we intentionally set to /etc/tqt3 similar to /etc/trinity for
 KDE programs. Install your application's system wide configuration file
-to /etc/tqt3. 
-
-Q: I'm compiling a program and I have a compile error due to a missing 
-include. Why isn't that include not present in the Debian packages anymore 
-? It compiled with older versions of Debian packages of Qt !
-
-A: This may be due to two reasons: either the package still uses the old 
-includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to 
-the naming convention. The filenames are now all following the scheme 
-
-ClassName -> classname.h. 
-
-Therefore, if you are the developer of the affected program, change your 
-sources according to this scheme. Qt ships with tqtrename140, a tool to
-help developers migrate their API to the Qt 3 version, 
-which can help you in the transition upgrade to Qt 3.
-
-If you are affected by this as a packager, notify upstream to fix those 
-problems and in the meanwhile use libtqt3-compat-headers as a build 
-dependency which includes the compatibility headers that just include the 
-right files from the new API again.
+to /etc/tqt3.
 
-Q: I have a question not covered by this FAQ and README file. Who should I 
+Q: I have a question not covered by this FAQ and README file. Who should I
 turn to ?
 
-A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) 
+A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org)
 for any questions regarding Qt on Debian.
 
  -- Ralf Nolden <nolden@kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
diff --git a/ubuntu/_base/dependencies/tqt3/debian/changelog b/ubuntu/_base/dependencies/tqt/debian/changelog
index 3e813531e..4d5a96f19 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/changelog
+++ b/ubuntu/_base/dependencies/tqt/debian/changelog
@@ -1,4 +1,4 @@
-tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low
+tqt (3:3.3.8-d-0ubuntu0) maverick; urgency=low
 
   * Upload of 3.3.8d (working revision) from GIT
 
diff --git a/ubuntu/_base/dependencies/tqt/debian/compat b/ubuntu/_base/dependencies/tqt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt/debian/control
index b394a2f95..0132b3c05 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/control
+++ b/ubuntu/_base/dependencies/tqt/debian/control
@@ -1,8 +1,8 @@
-Source: tqt-x11-free
+Source: tqt
 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>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4),
  libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
@@ -124,7 +124,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
  libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
-Recommends: libtqt3-compat-headers, libcups2-dev
+Recommends: libcups2-dev
 Suggests: libtqt3-i18n, tqt3-doc
 Description: TQt development files (Threaded)
  TQt is a C++ class library optimized for graphical user interface
@@ -132,13 +132,6 @@ Description: TQt development files (Threaded)
  for building threaded TQt applications as well as the libtqui.so symlink
  and the necessary header files for libtqui.so. (See README.Debian and
  the TQt Documentation for instructions on libtqui.so)
- .
- WARNING: If you plan to build some older TQt3 applications, you will
- most probably have to install the libtqt3-compat-headers package. It
- contains all the headers which are not part of the official TQt3 API
- anymore but which are still used by some programs. So if you encounter
- problems with missing header files, please install this package first
- before you send a bugreport.
 
 Package: libtqt3-headers
 Architecture: all
@@ -152,23 +145,6 @@ Description:  TQt3 header files
  with TQt3. If you want to compile or develop programs which use TQt3, you
  have to install this package.
 
-Package: libtqt3-compat-headers
-Architecture: all
-Multi-Arch: foreign
-Section: devel
-Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
-Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
-Depends: libtqt3-headers (= ${binary:Version})
-Recommends: libtqt3-mt-dev
-Description: TQt 1.x and 2.x compatibility includes
- This package contains header files that are intended for build
- compatibility for applications that build with TQt3 but still use
- deprecated includes. It is meant as an intermediate solution and
- these header files are not part of the official TQt3 API.
- All sourcecode that is still using the headers of this package is
- subject to be changed to use the new header files which are in
- libtqt3-headers.
-
 Package: tqt3-dev-tools
 Architecture: any
 Multi-Arch: foreign
@@ -179,7 +155,7 @@ Depends: ${shlibs:Depends}
 Recommends: libtqt3-mt-dev
 Description: TQt3 development tools
  This package contains all tools that are necessary to build programs
- that are written using TQt3. These are: qmake, uic and moc.
+ that are written using TQt3. These are: tqmake, tquic and tqmoc.
  For TQt3 development, you most likely want to install this package.
 
 Package: tqt3-designer
@@ -197,7 +173,7 @@ Description: TQt3 Designer
  create whole project and works together with the database drivers
  provided by TQt to create applications with easy database access through
  TQt. The resulting user interface files can then be converted to
- C++ classes using the uic commandline utility which is usually done
+ C++ classes using the tquic commandline utility which is usually done
  automatically for the developer with a project management with qmake
  or automake.
 
@@ -210,17 +186,27 @@ Depends: ${shlibs:Depends}
 Description: TQt3 Designer plugins
  This package contains plugins for TQt3 Designer
 
+Package: libtqt3-apps-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Conflicts: tqt3-apps-dev (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version})
+Description: TQt3 Developer applications development libraries
+ This package contains additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
+
 Package: tqt3-apps-dev
 Architecture: any
 Multi-Arch: no
 Section: devel
 Replaces: tqt3-apps-dev (<< 4:14.0.0~)
 Breaks: tqt3-apps-dev (<< 4:14.0.0~)
-Depends: libtqt3-mt-dev
+Depends: libtqt3-mt-dev, libtqt3-apps-dev
 Description: TQt3 Developer applications development files
  This package is intended for developers who want to develop applications
- using the additional static libraries that ship with the applications
- included with TQt; the TQt Designer and the TQt Assistant.
+ using the additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
  It allows integrating additional enhancements into the TQt Designer
  respectively faciliate the TQt Assistant from within your TQt application
  to interactively call the Assistant for displaying online help that the
@@ -275,21 +261,6 @@ Description: The TQt3 Configuration Application
  CJK-fonts or other non-latin scripts, you will most likely want to
  install this package.
 
-Package: tqt3-dev-tools-embedded
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~)
-Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~)
-Recommends: libtqt3-mt-dev
-Depends: ${shlibs:Depends}
-Description: Tools to develop embedded TQt applications
- This package contains applications only suitable for developing
- applications with TQt Embedded and/or Qtopia. It provides the QVFB
- program for simulating an embedded device desktop as well as maketqpf
- for converting fonts to embedded fonts suitable for being utilized
- by TQt Embedded applications.
-
 Package: tqt3-dev-tools-compat
 Architecture: any
 Multi-Arch: foreign
@@ -299,7 +270,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
 Recommends: libtqt3-mt-dev
 Depends: ${shlibs:Depends}
 Description: Conversion utilities for TQt3 development
- This package contains some older TQt tools (namely tqtrename140,
+ This package contains some older TQt tools (namely
  tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
  application developers who need to migrate any TQt application written
  for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
@@ -313,7 +284,7 @@ Multi-Arch: foreign
 Section: libs
 Replaces: libtqt3-i18n (<< 4:14.0.0~)
 Breaks: libtqt3-i18n (<< 4:14.0.0~)
-Recommends: libtqt3-mt
+Recommends: libtqt3-mt | libtqt3-mt-t64
 Description: i18n files for TQt3 library
  This package contains the internationalization files for the TQt library.
  TQt applications that are internationalized will need to depend on this package
diff --git a/ubuntu/_base/dependencies/tqt3/debian/copyright b/ubuntu/_base/dependencies/tqt/debian/copyright
index 3482b8b3a..3482b8b3a 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/copyright
+++ b/ubuntu/_base/dependencies/tqt/debian/copyright
diff --git a/ubuntu/_base/dependencies/tqt/debian/libtqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-apps-dev.install
new file mode 100644
index 000000000..eea094136
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-apps-dev.install
@@ -0,0 +1,3 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.*
diff --git a/ubuntu/_base/dependencies/tqt/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-headers.install
new file mode 100644
index 000000000..6a11ea7b5
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-headers.install
@@ -0,0 +1,267 @@
+usr/include/tqt3/private/*
+usr/include/tqt3/tqaccel.h
+usr/include/tqt3/tqaccessible.h
+usr/include/tqt3/tqaction.h
+usr/include/tqt3/tqapplication.h
+usr/include/tqt3/tqasciicache.h
+usr/include/tqt3/tqasciidict.h
+usr/include/tqt3/tqasyncimageio.h
+usr/include/tqt3/tqasyncio.h
+usr/include/tqt3/tqbig5codec.h
+usr/include/tqt3/tqbitarray.h
+usr/include/tqt3/tqbitmap.h
+usr/include/tqt3/tqbrush.h
+usr/include/tqt3/tqbuffer.h
+usr/include/tqt3/tqbutton.h
+usr/include/tqt3/tqbuttongroup.h
+usr/include/tqt3/tqcache.h
+usr/include/tqt3/tqcanvas.h
+usr/include/tqt3/tqcdestyle.h
+usr/include/tqt3/tqchar.h
+usr/include/tqt3/tqcheckbox.h
+usr/include/tqt3/tqcleanuphandler.h
+usr/include/tqt3/tqclipboard.h
+usr/include/tqt3/tqcolor.h
+usr/include/tqt3/tqcolordialog.h
+usr/include/tqt3/tqcombobox.h
+usr/include/tqt3/tqcommonstyle.h
+usr/include/tqt3/tqcompactstyle.h
+usr/include/tqt3/tqconnection.h
+usr/include/tqt3/tqcstring.h
+usr/include/tqt3/tqcursor.h
+usr/include/tqt3/tqdatabrowser.h
+usr/include/tqt3/tqdatastream.h
+usr/include/tqt3/tqdatatable.h
+usr/include/tqt3/tqdataview.h
+usr/include/tqt3/tqdatetime.h
+usr/include/tqt3/tqdatetimeedit.h
+usr/include/tqt3/tqdeepcopy.h
+usr/include/tqt3/tqdesktopwidget.h
+usr/include/tqt3/tqdial.h
+usr/include/tqt3/tqdialog.h
+usr/include/tqt3/tqdict.h
+usr/include/tqt3/tqdir.h
+usr/include/tqt3/tqdns.h
+usr/include/tqt3/tqdockarea.h
+usr/include/tqt3/tqdockwindow.h
+usr/include/tqt3/tqdom.h
+usr/include/tqt3/tqdragobject.h
+usr/include/tqt3/tqdrawutil.h
+usr/include/tqt3/tqdropsite.h
+usr/include/tqt3/tqeditorfactory.h
+usr/include/tqt3/tqerrormessage.h
+usr/include/tqt3/tqeucjpcodec.h
+usr/include/tqt3/tqeuckrcodec.h
+usr/include/tqt3/tqevent.h
+usr/include/tqt3/tqeventloop.h
+usr/include/tqt3/tqfeatures.h
+usr/include/tqt3/tqfile.h
+usr/include/tqt3/tqfiledialog.h
+usr/include/tqt3/tqfileinfo.h
+usr/include/tqt3/tqfocusdata.h
+usr/include/tqt3/tqfont.h
+usr/include/tqt3/tqfontdatabase.h
+usr/include/tqt3/tqfontdialog.h
+usr/include/tqt3/tqfontinfo.h
+usr/include/tqt3/tqfontmetrics.h
+usr/include/tqt3/tqframe.h
+usr/include/tqt3/tqftp.h
+usr/include/tqt3/tqgarray.h
+usr/include/tqt3/tqgb18030codec.h
+usr/include/tqt3/tqgbkcodec.h
+usr/include/tqt3/tqgcache.h
+usr/include/tqt3/tqgdict.h
+usr/include/tqt3/tqgif.h
+usr/include/tqt3/tqglist.h
+usr/include/tqt3/tqglobal.h
+usr/include/tqt3/tqgplugin.h
+usr/include/tqt3/tqgrid.h
+usr/include/tqt3/tqgridview.h
+usr/include/tqt3/tqgroupbox.h
+usr/include/tqt3/tqguardedptr.h
+usr/include/tqt3/tqgvector.h
+usr/include/tqt3/tqhbox.h
+usr/include/tqt3/tqhbuttongroup.h
+usr/include/tqt3/tqheader.h
+usr/include/tqt3/tqhebrewcodec.h
+usr/include/tqt3/tqhgroupbox.h
+usr/include/tqt3/tqhostaddress.h
+usr/include/tqt3/tqhttp.h
+usr/include/tqt3/tqiconset.h
+usr/include/tqt3/tqiconview.h
+usr/include/tqt3/tqimage.h
+usr/include/tqt3/tqimageformatplugin.h
+usr/include/tqt3/tqinputcontext.h
+usr/include/tqt3/tqinputcontextfactory.h
+usr/include/tqt3/tqinputcontextplugin.h
+usr/include/tqt3/tqinputdialog.h
+usr/include/tqt3/tqintcache.h
+usr/include/tqt3/tqintdict.h
+usr/include/tqt3/tqinterlacestyle.h
+usr/include/tqt3/tqiodevice.h
+usr/include/tqt3/tqjiscodec.h
+usr/include/tqt3/tqjpegio.h
+usr/include/tqt3/tqjpunicode.h
+usr/include/tqt3/tqkeycode.h
+usr/include/tqt3/tqkeysequence.h
+usr/include/tqt3/tqlabel.h
+usr/include/tqt3/tqlayout.h
+usr/include/tqt3/tqlcdnumber.h
+usr/include/tqt3/tqlibrary.h
+usr/include/tqt3/tqlineedit.h
+usr/include/tqt3/tqlistbox.h
+usr/include/tqt3/tqlistview.h
+usr/include/tqt3/tqlocale.h
+usr/include/tqt3/tqlocalfs.h
+usr/include/tqt3/tqmainwindow.h
+usr/include/tqt3/tqmap.h
+usr/include/tqt3/tqmemarray.h
+usr/include/tqt3/tqmenubar.h
+usr/include/tqt3/tqmenudata.h
+usr/include/tqt3/tqmessagebox.h
+usr/include/tqt3/tqmetaobject.h
+usr/include/tqt3/tqmime.h
+usr/include/tqt3/tqmngio.h
+usr/include/tqt3/tqmotifstyle.h
+usr/include/tqt3/tqmotifplusstyle.h
+usr/include/tqt3/tqmovie.h
+usr/include/tqt3/tqmultilineedit.h
+usr/include/tqt3/tqmutex.h
+usr/include/tqt3/tqnamespace.h
+usr/include/tqt3/tqnetwork.h
+usr/include/tqt3/tqnetworkprotocol.h
+usr/include/tqt3/tqobject.h
+usr/include/tqt3/tqobjectcleanuphandler.h
+usr/include/tqt3/tqobjectdefs.h
+usr/include/tqt3/tqobjectdict.h
+usr/include/tqt3/tqobjectlist.h
+usr/include/tqt3/tqpaintdevice.h
+usr/include/tqt3/tqpaintdevicemetrics.h
+usr/include/tqt3/tqpainter.h
+usr/include/tqt3/tqpair.h
+usr/include/tqt3/tqpalette.h
+usr/include/tqt3/tqpen.h
+usr/include/tqt3/tqpicture.h
+usr/include/tqt3/tqpixmap.h
+usr/include/tqt3/tqpixmapcache.h
+usr/include/tqt3/tqplatinumstyle.h
+usr/include/tqt3/tqpngio.h
+usr/include/tqt3/tqpoint.h
+usr/include/tqt3/tqpointarray.h
+usr/include/tqt3/tqpolygonscanner.h
+usr/include/tqt3/tqpopupmenu.h
+usr/include/tqt3/tqprintdialog.h
+usr/include/tqt3/tqprinter.h
+usr/include/tqt3/tqprocess.h
+usr/include/tqt3/tqprogressbar.h
+usr/include/tqt3/tqprogressdialog.h
+usr/include/tqt3/tqptrcollection.h
+usr/include/tqt3/tqptrdict.h
+usr/include/tqt3/tqptrlist.h
+usr/include/tqt3/tqptrqueue.h
+usr/include/tqt3/tqptrstack.h
+usr/include/tqt3/tqptrvector.h
+usr/include/tqt3/tqpushbutton.h
+usr/include/tqt3/tqradiobutton.h
+usr/include/tqt3/tqrangecontrol.h
+usr/include/tqt3/tqrect.h
+usr/include/tqt3/tqregexp.h
+usr/include/tqt3/tqregion.h
+usr/include/tqt3/tqscrollbar.h
+usr/include/tqt3/tqscrollview.h
+usr/include/tqt3/tqsemaphore.h
+usr/include/tqt3/tqserversocket.h
+usr/include/tqt3/tqsessionmanager.h
+usr/include/tqt3/tqsettings.h
+usr/include/tqt3/tqsgistyle.h
+usr/include/tqt3/tqshared.h
+usr/include/tqt3/tqsignal.h
+usr/include/tqt3/tqsignalmapper.h
+usr/include/tqt3/tqsignalslotimp.h
+usr/include/tqt3/tqsimplerichtext.h
+usr/include/tqt3/tqsize.h
+usr/include/tqt3/tqsizegrip.h
+usr/include/tqt3/tqsizepolicy.h
+usr/include/tqt3/tqsjiscodec.h
+usr/include/tqt3/tqslider.h
+usr/include/tqt3/tqsocket.h
+usr/include/tqt3/tqsocketdevice.h
+usr/include/tqt3/tqsocketnotifier.h
+usr/include/tqt3/tqsound.h
+usr/include/tqt3/tqspinbox.h
+usr/include/tqt3/tqsplashscreen.h
+usr/include/tqt3/tqsplitter.h
+usr/include/tqt3/tqsql.h
+usr/include/tqt3/tqsqlcursor.h
+usr/include/tqt3/tqsqldatabase.h
+usr/include/tqt3/tqsqldriver.h
+usr/include/tqt3/tqsqldriverplugin.h
+usr/include/tqt3/tqsqleditorfactory.h
+usr/include/tqt3/tqsqlerror.h
+usr/include/tqt3/tqsqlfield.h
+usr/include/tqt3/tqsqlform.h
+usr/include/tqt3/tqsqlindex.h
+usr/include/tqt3/tqsqlpropertymap.h
+usr/include/tqt3/tqsqlquery.h
+usr/include/tqt3/tqsqlrecord.h
+usr/include/tqt3/tqsqlresult.h
+usr/include/tqt3/tqsqlselectcursor.h
+usr/include/tqt3/tqstatusbar.h
+usr/include/tqt3/tqstring.h
+usr/include/tqt3/tqstringlist.h
+usr/include/tqt3/tqstrlist.h
+usr/include/tqt3/tqstrvec.h
+usr/include/tqt3/tqstyle.h
+usr/include/tqt3/tqstylefactory.h
+usr/include/tqt3/tqstyleplugin.h
+usr/include/tqt3/tqstylesheet.h
+usr/include/tqt3/tqsyntaxhighlighter.h
+usr/include/tqt3/tqt.h
+usr/include/tqt3/tqtabbar.h
+usr/include/tqt3/tqtabdialog.h
+usr/include/tqt3/tqtable.h
+usr/include/tqt3/tqtabwidget.h
+usr/include/tqt3/tqtextbrowser.h
+usr/include/tqt3/tqtextcodec.h
+usr/include/tqt3/tqtextcodecfactory.h
+usr/include/tqt3/tqtextcodecplugin.h
+usr/include/tqt3/tqtextedit.h
+usr/include/tqt3/tqtextstream.h
+usr/include/tqt3/tqtextview.h
+usr/include/tqt3/tqthread.h
+usr/include/tqt3/tqthreadstorage.h
+usr/include/tqt3/tqtimer.h
+usr/include/tqt3/tqtl.h
+usr/include/tqt3/tqtoolbar.h
+usr/include/tqt3/tqtoolbox.h
+usr/include/tqt3/tqtoolbutton.h
+usr/include/tqt3/tqtooltip.h
+usr/include/tqt3/tqtranslator.h
+usr/include/tqt3/tqtsciicodec.h
+usr/include/tqt3/tqurl.h
+usr/include/tqt3/tqurlinfo.h
+usr/include/tqt3/tqurloperator.h
+usr/include/tqt3/tqutfcodec.h
+usr/include/tqt3/tquuid.h
+usr/include/tqt3/tqvalidator.h
+usr/include/tqt3/tqvaluelist.h
+usr/include/tqt3/tqvaluestack.h
+usr/include/tqt3/tqvaluevector.h
+usr/include/tqt3/tqvariant.h
+usr/include/tqt3/tqvbox.h
+usr/include/tqt3/tqvbuttongroup.h
+usr/include/tqt3/tqvgroupbox.h
+usr/include/tqt3/tqwaitcondition.h
+usr/include/tqt3/tqwhatsthis.h
+usr/include/tqt3/tqwidget.h
+usr/include/tqt3/tqwidgetintdict.h
+usr/include/tqt3/tqwidgetlist.h
+usr/include/tqt3/tqwidgetplugin.h
+usr/include/tqt3/tqwidgetstack.h
+usr/include/tqt3/tqwindowdefs.h
+usr/include/tqt3/tqwindowsstyle.h
+usr/include/tqt3/tqwinexport.h
+usr/include/tqt3/tqwizard.h
+usr/include/tqt3/tqwmatrix.h
+usr/include/tqt3/tqworkspace.h
+usr/include/tqt3/tqxml.h
diff --git a/ubuntu/_base/dependencies/tqt/debian/libtqt3-i18n.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-i18n.install
new file mode 100644
index 000000000..249feb9ef
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-i18n.install
@@ -0,0 +1,18 @@
+usr/share/tqt3/translations/qt_ar.qm
+usr/share/tqt3/translations/qt_ca.qm
+usr/share/tqt3/translations/qt_cs.qm
+usr/share/tqt3/translations/qt_de.qm
+usr/share/tqt3/translations/qt_es.qm
+usr/share/tqt3/translations/qt_es_AR.qm
+usr/share/tqt3/translations/qt_fr.qm
+usr/share/tqt3/translations/qt_he.qm
+usr/share/tqt3/translations/qt_it.qm
+usr/share/tqt3/translations/qt_ja.qm
+usr/share/tqt3/translations/qt_nb.qm
+usr/share/tqt3/translations/qt_pt-br.qm
+usr/share/tqt3/translations/qt_pt.qm
+usr/share/tqt3/translations/qt_ru.qm
+usr/share/tqt3/translations/qt_sk.qm
+usr/share/tqt3/translations/qt_tr.qm
+usr/share/tqt3/translations/qt_zh-cn.qm
+usr/share/tqt3/translations/qt_zh-tw.qm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-data.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-data.install
index b9308b1b4..b9308b1b4 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-data.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-data.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.docs
index dbd9a5d19..59a51ee13 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.docs
@@ -1,4 +1,5 @@
-README
+README.md
 README.immodule
+README.Qt3
 README-QT.TXT
 PLATFORMS
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.install
index c86cba1b1..d2904e511 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.install
@@ -4,8 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so
 usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl
 usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so
 usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc
-usr/include/tqt3/ntqconfig.h
-usr/include/tqt3/ntqgl.h
-usr/include/tqt3/ntqglcolormap.h
-usr/include/tqt3/ntqmodules.h
-usr/include/tqt3/ntqwidgetfactory.h
+usr/include/tqt3/tqconfig.h
+usr/include/tqt3/tqgl.h
+usr/include/tqt3/tqglcolormap.h
+usr/include/tqt3/tqmodules.h
+usr/include/tqt3/tqwidgetfactory.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.links
index 9da3a5e25..9da3a5e25 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-dev.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-ibase.install
index 1cdae4fe4..1cdae4fe4 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-ibase.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-mysql.install
index 8f5572965..8f5572965 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-mysql.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-odbc.install
index d51b3fd7f..d51b3fd7f 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-odbc.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-psql.install
index a5e2b70cd..a5e2b70cd 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-psql.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-sqlite.install
index d637b096b..d637b096b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-sqlite.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-sqlite3.install
index 3f3392374..3f3392374 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt-sqlite3.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.docs
index dbd9a5d19..59a51ee13 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.docs
@@ -1,4 +1,5 @@
-README
+README.md
 README.immodule
+README.Qt3
 README-QT.TXT
 PLATFORMS
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.install
index 33303e90c..023c39399 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.install
@@ -1,4 +1,4 @@
 usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.*
 usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.*
-usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libtqmng.so
 usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.links
index 8c8f30e38..8c8f30e38 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.postrm b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.postrm
index bb679158a..bb679158a 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.postrm
+++ b/ubuntu/_base/dependencies/tqt/debian/libtqt3-mt.postrm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/tqt/debian/maintain/build-examples.sh
index f62d83b85..ed29d712b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh
+++ b/ubuntu/_base/dependencies/tqt/debian/maintain/build-examples.sh
@@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3
 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
 
 # Now compile the examples. The themes example
-# won't work since ntqconfig.h is not really correct with the
+# won't work since tqconfig.h is not really correct with the
 # ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue
 cd examples; qmake -o Makefile examples.pro; make -k
 
diff --git a/ubuntu/_base/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/_base/dependencies/tqt/debian/patches/06_disable_rpath.diff
index a3d74ffce..a3d74ffce 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/_base/dependencies/tqt/debian/patches/06_disable_rpath.diff
diff --git a/ubuntu/_base/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/ubuntu/_base/dependencies/tqt/debian/patches/09_amd64_lib64.diff
index de42482fc..de42482fc 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
+++ b/ubuntu/_base/dependencies/tqt/debian/patches/09_amd64_lib64.diff
diff --git a/ubuntu/_base/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/_base/dependencies/tqt/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
index b4e71d35b..b4e71d35b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ b/ubuntu/_base/dependencies/tqt/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
diff --git a/ubuntu/_base/dependencies/tqt3/debian/patches/series b/ubuntu/_base/dependencies/tqt/debian/patches/series
index e6bdb92af..e6bdb92af 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/patches/series
+++ b/ubuntu/_base/dependencies/tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/tqt/debian/qt_plugins_3.3rc
index e193b495c..6a411f315 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc
+++ b/ubuntu/_base/dependencies/tqt/debian/qt_plugins_3.3rc
@@ -1,4 +1,4 @@
 [usr]
 lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
-lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
+lib/tqt3/plugins/imageformats/libtqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
 
diff --git a/ubuntu/_base/dependencies/tqt3/debian/qtrc b/ubuntu/_base/dependencies/tqt/debian/qtrc
index 4f44006ae..4f44006ae 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/qtrc
+++ b/ubuntu/_base/dependencies/tqt/debian/qtrc
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt/debian/rules
index ddc008924..fa9b59714 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt/debian/rules
@@ -25,6 +25,13 @@ DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+DEB_TIME64_API		= $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX	= -t64
+else
+DEB_TIME64_SUFFIX	=
+endif
+
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL ?= true
@@ -44,7 +51,7 @@ endif #hurd
 
 # build variables (directorys)
 DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libtqt3-mt
+P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX)
 P_DOC = $(DEBIAN)/tqt3-doc
 P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
 P_HEADERS = $(DEBIAN)/libtqt3-headers
@@ -139,6 +146,22 @@ endif
 
 post-patches::
 	dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+	# update library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "/libtqt3-mt\." | \
+	grep -v "\.t64$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.t64 ] || \
+	    (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+	done
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \
+	    -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \
+	    -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+endif
 
 build build-arch: libqt-thread-stamp
 build-indep:
@@ -162,17 +185,12 @@ libqt-thread-stamp: post-patches
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
 	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
-	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/
 
 	# build tqtconv2ui
 	cd tools/designer/tools/tqtconv2ui && $(MAKE)
 	cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui
 
-	# build tqvfb
-	cd tools/tqvfb/ && $(MAKE)
-	cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb
-
 	# install qmake.cache file
 	install -d $(P_QTMTDEV)/usr/share/tqt3/
 	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache
@@ -191,16 +209,16 @@ clean::
 
 	if [ -f "src/Makefile" ]; then \
 		$(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
-		$(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \
+		$(MAKE) -C tools/qconfig distclean; \
 		$(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \
 		$(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \
-		$(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+		$(MAKE) -C tools/designer/plugins/glade distclean; \
 		$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
 	fi
 
 	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
-		config.status bin/moc bin/tqmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
-		src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \
+		config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
+		src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \
 		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
 		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
 		config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
@@ -225,6 +243,27 @@ clean::
 
 	dh_clean
 
+ifeq ($(DEB_TIME64_API),true)
+	# revert library package name for TIME64 ABI
+	ls -d debian/* | \
+	grep -E "\.t64$$" | \
+	while read a; do \
+	    mv $$a $${a%.t64}; \
+	done
+	ls -d debian/* | \
+	grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \
+	xargs -r rm
+	[ -f debian/control.t64 ] || \
+	sed -i.t64 \
+	    -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \
+	    -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \
+	    -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+	    debian/control
+else
+	[ ! -f debian/control.t64 ] || \
+	mv debian/control.t64 debian/control
+endif
+
 install: build
 
 	dh_testdir
@@ -367,11 +406,6 @@ binary-arch: build install
 	cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/
 	rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h
 
-	## tqvfb package
-	install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin
-	install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png
-	install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png
-
 	# remove utterly ugle symlink
 	rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++
 
@@ -424,7 +458,7 @@ binary-arch: build install
 	dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html
 
 	# copy README.Debian
-	for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+	for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
 
 	# install the qmake binary
 	rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake
@@ -461,14 +495,11 @@ binary-arch: build install
 	dh_makeshlibs -a $(IBASE) -V
 	dh_installdeb -a $(IBASE)
 	dh_perl -a $(IBASE)
-	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib
 
 	# fix shlibdeps madness
 	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
 
-	# fix conffiles file for tqt3-dev-tools-embedded
-	echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles
-
 	dh_gencontrol -a $(IBASE)
 	dh_md5sums -a $(IBASE)
 	dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
diff --git a/ubuntu/_base/dependencies/tqt/debian/source/format b/ubuntu/_base/dependencies/tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/tqt/debian/source/options b/ubuntu/_base/dependencies/tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/tqt/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-apps-dev.install
new file mode 100644
index 000000000..d3cfad18a
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-apps-dev.install
@@ -0,0 +1,4 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so
+usr/include/tqt3/tqassistantclient.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-apps-dev.links
index 72bd7093a..60fe91b77 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-apps-dev.links
@@ -1,8 +1,8 @@
 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so
 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so
 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.install
index 4cfd10cf1..4cfd10cf1 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.links
index 5244653a5..5244653a5 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.menu b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.menu
index d59f83bd0..d59f83bd0 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.menu
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.menu
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.postinst b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.postinst
index 041457133..041457133 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.postinst
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.postinst
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.prerm b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.prerm
index 36371091e..36371091e 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.prerm
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-assistant.prerm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer-plugins.install
index 13fed3016..13fed3016 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer-plugins.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.install
index 6cfffd9cd..6cfffd9cd 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.links
index 19922f299..19922f299 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.manpages
index 5fcb29982..5fcb29982 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.manpages
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.menu b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.menu
index be078bd49..be078bd49 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.menu
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.menu
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.postinst
index 54bc5ea75..54bc5ea75 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.postinst
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.prerm b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.prerm
index 93376ef35..93376ef35 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.prerm
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-designer.prerm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools-compat.install
index 56e0156b5..5975d4bb9 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools-compat.install
@@ -1,4 +1,3 @@
-usr/bin/tqtrename140
 usr/bin/tqm2ts
 usr/bin/tqtmergetr
 usr/bin/tqtfindtr
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.install
index 3c795661b..3c795661b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.links
index 073720d2b..073720d2b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.manpages
index 2976f6c84..2976f6c84 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.manpages
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.postinst
index e7f14ec70..e7f14ec70 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.postinst
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.prerm
index 0ec40c9e9..0ec40c9e9 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.prerm
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-dev-tools.prerm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.doc-base b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.doc-base
index 08f4fcdc3..08f4fcdc3 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.doc-base
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.doc-base
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.docs
index f08fd0f02..2630a416c 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.docs
@@ -1,2 +1,3 @@
 FAQ
+README.md
 README-QT.TXT
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.links
index dfec5318b..dfec5318b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-doc.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.install
index c02015323..c02015323 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.links
index 4fa700555..4fa700555 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.manpages
index 14380e5ab..14380e5ab 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.manpages
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.menu b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.menu
index 976cb4b3c..976cb4b3c 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.menu
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.menu
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.postinst
index 48b3216db..48b3216db 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.postinst
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.prerm b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.prerm
index 47d704eb8..47d704eb8 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.prerm
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-linguist.prerm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.install
index 6b1f88962..6b1f88962 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.install
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.links b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.links
index eb6dd21c0..eb6dd21c0 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.links
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.links
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.manpages
index 025ff0ad8..025ff0ad8 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.manpages
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.menu b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.menu
index 79f2ff8e5..79f2ff8e5 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.menu
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.menu
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.postinst
index 773022f72..773022f72 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.postinst
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.prerm
index 27f898ea3..27f898ea3 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.prerm
+++ b/ubuntu/_base/dependencies/tqt/debian/tqt3-qtconfig.prerm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/compat b/ubuntu/_base/dependencies/tqt3/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
deleted file mode 100644
index d2bcbd7d6..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
+++ /dev/null
@@ -1,48 +0,0 @@
-usr/include/tqt3/ntqapp.h
-usr/include/tqt3/ntqarray.h
-usr/include/tqt3/ntqbitarry.h
-usr/include/tqt3/ntqbttngrp.h
-usr/include/tqt3/ntqchkbox.h
-usr/include/tqt3/ntqclipbrd.h
-usr/include/tqt3/ntqcollect.h
-usr/include/tqt3/ntqcollection.h
-usr/include/tqt3/ntqcombo.h
-usr/include/tqt3/ntqconnect.h
-usr/include/tqt3/ntqdatetm.h
-usr/include/tqt3/ntqdrawutl.h
-usr/include/tqt3/ntqdstream.h
-usr/include/tqt3/ntqfiledef.h
-usr/include/tqt3/ntqfiledlg.h
-usr/include/tqt3/ntqfileinf.h
-usr/include/tqt3/ntqfontinf.h
-usr/include/tqt3/ntqfontmet.h
-usr/include/tqt3/ntqgrpbox.h
-usr/include/tqt3/ntqintcach.h
-usr/include/tqt3/ntqiodev.h
-usr/include/tqt3/ntqlcdnum.h
-usr/include/tqt3/ntqlined.h
-usr/include/tqt3/ntqmenudta.h
-usr/include/tqt3/ntqmetaobj.h
-usr/include/tqt3/ntqmlined.h
-usr/include/tqt3/ntqmsgbox.h
-usr/include/tqt3/ntqmultilinedit.h
-usr/include/tqt3/ntqobjcoll.h
-usr/include/tqt3/ntqobjdefs.h
-usr/include/tqt3/ntqpdevmet.h
-usr/include/tqt3/ntqpmcache.h
-usr/include/tqt3/ntqpntarry.h
-usr/include/tqt3/ntqpopmenu.h
-usr/include/tqt3/ntqprndlg.h
-usr/include/tqt3/ntqprogbar.h
-usr/include/tqt3/ntqprogdlg.h
-usr/include/tqt3/ntqpsprn.h
-usr/include/tqt3/ntqpushbt.h
-usr/include/tqt3/ntqqueue.h
-usr/include/tqt3/ntqradiobt.h
-usr/include/tqt3/ntqrangect.h
-usr/include/tqt3/ntqscrbar.h
-usr/include/tqt3/ntqsocknot.h
-usr/include/tqt3/ntqtabdlg.h
-usr/include/tqt3/ntqtstream.h
-usr/include/tqt3/ntqwidcoll.h
-usr/include/tqt3/ntqwindefs.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
deleted file mode 100644
index 92ebc61fb..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
+++ /dev/null
@@ -1,273 +0,0 @@
-usr/include/tqt3/private/*
-usr/include/tqt3/ntqabstractlayout.h
-usr/include/tqt3/ntqaccel.h
-usr/include/tqt3/ntqaccessible.h
-usr/include/tqt3/ntqaction.h
-usr/include/tqt3/ntqapplication.h
-usr/include/tqt3/ntqasciicache.h
-usr/include/tqt3/ntqasciidict.h
-usr/include/tqt3/ntqasyncimageio.h
-usr/include/tqt3/ntqasyncio.h
-usr/include/tqt3/ntqbig5codec.h
-usr/include/tqt3/ntqbitarray.h
-usr/include/tqt3/ntqbitmap.h
-usr/include/tqt3/ntqbrush.h
-usr/include/tqt3/ntqbuffer.h
-usr/include/tqt3/ntqbutton.h
-usr/include/tqt3/ntqbuttongroup.h
-usr/include/tqt3/ntqcache.h
-usr/include/tqt3/ntqcanvas.h
-usr/include/tqt3/ntqcdestyle.h
-usr/include/tqt3/ntqcheckbox.h
-usr/include/tqt3/ntqcleanuphandler.h
-usr/include/tqt3/ntqclipboard.h
-usr/include/tqt3/ntqcolor.h
-usr/include/tqt3/ntqcolordialog.h
-usr/include/tqt3/ntqcombobox.h
-usr/include/tqt3/ntqcommonstyle.h
-usr/include/tqt3/ntqcompactstyle.h
-usr/include/tqt3/ntqconnection.h
-usr/include/tqt3/ntqcstring.h
-usr/include/tqt3/ntqcursor.h
-usr/include/tqt3/ntqdatabrowser.h
-usr/include/tqt3/ntqdatastream.h
-usr/include/tqt3/ntqdatatable.h
-usr/include/tqt3/ntqdataview.h
-usr/include/tqt3/ntqdatetime.h
-usr/include/tqt3/ntqdatetimeedit.h
-usr/include/tqt3/ntqdeepcopy.h
-usr/include/tqt3/ntqdesktopwidget.h
-usr/include/tqt3/ntqdial.h
-usr/include/tqt3/ntqdialog.h
-usr/include/tqt3/ntqdict.h
-usr/include/tqt3/ntqdir.h
-usr/include/tqt3/ntqdns.h
-usr/include/tqt3/ntqdockarea.h
-usr/include/tqt3/ntqdockwindow.h
-usr/include/tqt3/ntqdom.h
-usr/include/tqt3/ntqdragobject.h
-usr/include/tqt3/ntqdrawutil.h
-usr/include/tqt3/ntqdropsite.h
-usr/include/tqt3/ntqeditorfactory.h
-usr/include/tqt3/ntqerrormessage.h
-usr/include/tqt3/ntqeucjpcodec.h
-usr/include/tqt3/ntqeuckrcodec.h
-usr/include/tqt3/ntqevent.h
-usr/include/tqt3/ntqeventloop.h
-usr/include/tqt3/ntqfeatures.h
-usr/include/tqt3/ntqfile.h
-usr/include/tqt3/ntqfiledialog.h
-usr/include/tqt3/ntqfileinfo.h
-usr/include/tqt3/ntqfocusdata.h
-usr/include/tqt3/ntqfont.h
-usr/include/tqt3/ntqfontdatabase.h
-usr/include/tqt3/ntqfontdialog.h
-usr/include/tqt3/ntqfontinfo.h
-usr/include/tqt3/ntqfontmetrics.h
-usr/include/tqt3/ntqframe.h
-usr/include/tqt3/ntqftp.h
-usr/include/tqt3/ntqgarray.h
-usr/include/tqt3/ntqgb18030codec.h
-usr/include/tqt3/ntqgbkcodec.h
-usr/include/tqt3/ntqgcache.h
-usr/include/tqt3/ntqgdict.h
-usr/include/tqt3/ntqgeneric.h
-usr/include/tqt3/ntqgif.h
-usr/include/tqt3/ntqglist.h
-usr/include/tqt3/ntqglobal.h
-usr/include/tqt3/ntqgplugin.h
-usr/include/tqt3/ntqgrid.h
-usr/include/tqt3/ntqgridview.h
-usr/include/tqt3/ntqgroupbox.h
-usr/include/tqt3/ntqguardedptr.h
-usr/include/tqt3/ntqgvector.h
-usr/include/tqt3/ntqhbox.h
-usr/include/tqt3/ntqhbuttongroup.h
-usr/include/tqt3/ntqheader.h
-usr/include/tqt3/ntqhgroupbox.h
-usr/include/tqt3/ntqhostaddress.h
-usr/include/tqt3/ntqhttp.h
-usr/include/tqt3/ntqiconset.h
-usr/include/tqt3/ntqiconview.h
-usr/include/tqt3/ntqimage.h
-usr/include/tqt3/ntqimageformatplugin.h
-usr/include/tqt3/ntqinputcontext.h
-usr/include/tqt3/ntqinputcontextfactory.h
-usr/include/tqt3/ntqinputcontextplugin.h
-usr/include/tqt3/ntqinputdialog.h
-usr/include/tqt3/ntqintcache.h
-usr/include/tqt3/ntqintdict.h
-usr/include/tqt3/ntqinterlacestyle.h
-usr/include/tqt3/ntqiodevice.h
-usr/include/tqt3/ntqjiscodec.h
-usr/include/tqt3/ntqjpegio.h
-usr/include/tqt3/ntqjpunicode.h
-usr/include/tqt3/ntqkeycode.h
-usr/include/tqt3/ntqkeysequence.h
-usr/include/tqt3/ntqlabel.h
-usr/include/tqt3/ntqlayout.h
-usr/include/tqt3/ntqlcdnumber.h
-usr/include/tqt3/ntqlibrary.h
-usr/include/tqt3/ntqlineedit.h
-usr/include/tqt3/ntqlistbox.h
-usr/include/tqt3/ntqlistview.h
-usr/include/tqt3/ntqlocale.h
-usr/include/tqt3/ntqlocalfs.h
-usr/include/tqt3/ntqmainwindow.h
-usr/include/tqt3/ntqmap.h
-usr/include/tqt3/ntqmemarray.h
-usr/include/tqt3/ntqmenubar.h
-usr/include/tqt3/ntqmenudata.h
-usr/include/tqt3/ntqmessagebox.h
-usr/include/tqt3/ntqmetaobject.h
-usr/include/tqt3/ntqmime.h
-usr/include/tqt3/ntqmngio.h
-usr/include/tqt3/ntqmotifstyle.h
-usr/include/tqt3/ntqmotifplusstyle.h
-usr/include/tqt3/ntqmovie.h
-usr/include/tqt3/ntqmultilineedit.h
-usr/include/tqt3/ntqmutex.h
-usr/include/tqt3/ntqnamespace.h
-usr/include/tqt3/ntqnetwork.h
-usr/include/tqt3/ntqnetworkprotocol.h
-usr/include/tqt3/ntqnp.h
-usr/include/tqt3/ntqobject.h
-usr/include/tqt3/ntqobjectcleanuphandler.h
-usr/include/tqt3/ntqobjectdefs.h
-usr/include/tqt3/ntqobjectdict.h
-usr/include/tqt3/ntqobjectlist.h
-usr/include/tqt3/ntqpaintdevice.h
-usr/include/tqt3/ntqpaintdevicemetrics.h
-usr/include/tqt3/ntqpainter.h
-usr/include/tqt3/ntqpair.h
-usr/include/tqt3/ntqpalette.h
-usr/include/tqt3/ntqpen.h
-usr/include/tqt3/ntqpicture.h
-usr/include/tqt3/ntqpixmap.h
-usr/include/tqt3/ntqpixmapcache.h
-usr/include/tqt3/ntqplatinumstyle.h
-usr/include/tqt3/ntqpngio.h
-usr/include/tqt3/ntqpoint.h
-usr/include/tqt3/ntqpointarray.h
-usr/include/tqt3/ntqpolygonscanner.h
-usr/include/tqt3/ntqpopupmenu.h
-usr/include/tqt3/ntqprintdialog.h
-usr/include/tqt3/ntqprinter.h
-usr/include/tqt3/ntqprocess.h
-usr/include/tqt3/ntqprogressbar.h
-usr/include/tqt3/ntqprogressdialog.h
-usr/include/tqt3/ntqptrcollection.h
-usr/include/tqt3/ntqptrdict.h
-usr/include/tqt3/ntqptrlist.h
-usr/include/tqt3/ntqptrqueue.h
-usr/include/tqt3/ntqptrstack.h
-usr/include/tqt3/ntqptrvector.h
-usr/include/tqt3/ntqpushbutton.h
-usr/include/tqt3/ntqradiobutton.h
-usr/include/tqt3/ntqrangecontrol.h
-usr/include/tqt3/ntqrect.h
-usr/include/tqt3/ntqregexp.h
-usr/include/tqt3/ntqregion.h
-usr/include/tqt3/ntqrtlcodec.h
-usr/include/tqt3/ntqscrollbar.h
-usr/include/tqt3/ntqscrollview.h
-usr/include/tqt3/ntqsemaphore.h
-usr/include/tqt3/ntqsemimodal.h
-usr/include/tqt3/ntqserversocket.h
-usr/include/tqt3/ntqsession.h
-usr/include/tqt3/ntqsessionmanager.h
-usr/include/tqt3/ntqsettings.h
-usr/include/tqt3/ntqsgistyle.h
-usr/include/tqt3/ntqshared.h
-usr/include/tqt3/ntqsignal.h
-usr/include/tqt3/ntqsignalmapper.h
-usr/include/tqt3/ntqsignalslotimp.h
-usr/include/tqt3/ntqsimplerichtext.h
-usr/include/tqt3/ntqsize.h
-usr/include/tqt3/ntqsizegrip.h
-usr/include/tqt3/ntqsizepolicy.h
-usr/include/tqt3/ntqsjiscodec.h
-usr/include/tqt3/ntqslider.h
-usr/include/tqt3/ntqsocket.h
-usr/include/tqt3/ntqsocketdevice.h
-usr/include/tqt3/ntqsocketnotifier.h
-usr/include/tqt3/ntqsortedlist.h
-usr/include/tqt3/ntqsound.h
-usr/include/tqt3/ntqspinbox.h
-usr/include/tqt3/ntqsplashscreen.h
-usr/include/tqt3/ntqsplitter.h
-usr/include/tqt3/ntqsql.h
-usr/include/tqt3/ntqsqlcursor.h
-usr/include/tqt3/ntqsqldatabase.h
-usr/include/tqt3/ntqsqldriver.h
-usr/include/tqt3/ntqsqldriverplugin.h
-usr/include/tqt3/ntqsqleditorfactory.h
-usr/include/tqt3/ntqsqlerror.h
-usr/include/tqt3/ntqsqlfield.h
-usr/include/tqt3/ntqsqlform.h
-usr/include/tqt3/ntqsqlindex.h
-usr/include/tqt3/ntqsqlpropertymap.h
-usr/include/tqt3/ntqsqlquery.h
-usr/include/tqt3/ntqsqlrecord.h
-usr/include/tqt3/ntqsqlresult.h
-usr/include/tqt3/ntqsqlselectcursor.h
-usr/include/tqt3/ntqstatusbar.h
-usr/include/tqt3/ntqstring.h
-usr/include/tqt3/ntqstringlist.h
-usr/include/tqt3/ntqstrlist.h
-usr/include/tqt3/ntqstrvec.h
-usr/include/tqt3/ntqstyle.h
-usr/include/tqt3/ntqstylefactory.h
-usr/include/tqt3/ntqstyleplugin.h
-usr/include/tqt3/ntqstylesheet.h
-usr/include/tqt3/ntqsyntaxhighlighter.h
-usr/include/tqt3/ntqt.h
-usr/include/tqt3/ntqtabbar.h
-usr/include/tqt3/ntqtabdialog.h
-usr/include/tqt3/ntqtable.h
-usr/include/tqt3/ntqtabwidget.h
-usr/include/tqt3/ntqtextbrowser.h
-usr/include/tqt3/ntqtextcodec.h
-usr/include/tqt3/ntqtextcodecfactory.h
-usr/include/tqt3/ntqtextcodecplugin.h
-usr/include/tqt3/ntqtextedit.h
-usr/include/tqt3/ntqtextstream.h
-usr/include/tqt3/ntqtextview.h
-usr/include/tqt3/ntqthread.h
-usr/include/tqt3/ntqthreadstorage.h
-usr/include/tqt3/ntqtimer.h
-usr/include/tqt3/ntqtl.h
-usr/include/tqt3/ntqtoolbar.h
-usr/include/tqt3/ntqtoolbox.h
-usr/include/tqt3/ntqtoolbutton.h
-usr/include/tqt3/ntqtooltip.h
-usr/include/tqt3/ntqtranslator.h
-usr/include/tqt3/ntqtsciicodec.h
-usr/include/tqt3/ntqurl.h
-usr/include/tqt3/ntqurlinfo.h
-usr/include/tqt3/ntqurloperator.h
-usr/include/tqt3/ntqutfcodec.h
-usr/include/tqt3/ntquuid.h
-usr/include/tqt3/ntqvalidator.h
-usr/include/tqt3/ntqvaluelist.h
-usr/include/tqt3/ntqvaluestack.h
-usr/include/tqt3/ntqvaluevector.h
-usr/include/tqt3/ntqvariant.h
-usr/include/tqt3/ntqvbox.h
-usr/include/tqt3/ntqvbuttongroup.h
-usr/include/tqt3/ntqvfbhdr.h
-usr/include/tqt3/ntqvgroupbox.h
-usr/include/tqt3/ntqwaitcondition.h
-usr/include/tqt3/ntqwhatsthis.h
-usr/include/tqt3/ntqwidget.h
-usr/include/tqt3/ntqwidgetintdict.h
-usr/include/tqt3/ntqwidgetlist.h
-usr/include/tqt3/ntqwidgetplugin.h
-usr/include/tqt3/ntqwidgetstack.h
-usr/include/tqt3/ntqwindowdefs.h
-usr/include/tqt3/ntqwindowsstyle.h
-usr/include/tqt3/ntqwinexport.h
-usr/include/tqt3/ntqwizard.h
-usr/include/tqt3/ntqwmatrix.h
-usr/include/tqt3/ntqworkspace.h
-usr/include/tqt3/ntqxml.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-i18n.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-i18n.install
deleted file mode 100644
index cd272202b..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-i18n.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/tqt3/translations/qt_ar.qm
-usr/share/tqt3/translations/qt_cs.qm
-usr/share/tqt3/translations/qt_de.qm
-usr/share/tqt3/translations/qt_es.qm
-usr/share/tqt3/translations/qt_fr.qm
-usr/share/tqt3/translations/qt_he.qm
-usr/share/tqt3/translations/qt_ru.qm
-usr/share/tqt3/translations/qt_sk.qm
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
deleted file mode 100644
index d60b07fc7..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.*
-usr/include/tqt3/ntqassistantclient.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
deleted file mode 100644
index 38a249f41..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/maketqpf
-usr/bin/tqvfb
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
deleted file mode 100644
index 72baff7fd..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf
-/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/changelog b/ubuntu/_base/dependencies/tqtinterface/debian/changelog
deleted file mode 100644
index 460ca1061..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-libtqtinterface (4:0.3.0) lucid; urgency=low
-
-  * Initial release of the TQt Interface Library, supporting Qt3
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 12 Jul 2010 03:13:00 -0600
\ No newline at end of file
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/compat b/ubuntu/_base/dependencies/tqtinterface/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
deleted file mode 100644
index 4bd9ab301..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/control
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: libtqtinterface
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-apps-dev
-Standards-Version: 3.8.4
-
-Package: libtqtinterface
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libtqtinterface (<< 4:14.0.0~)
-Breaks: libtqtinterface (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Description: The Trinity Qt Interface Libraries
- The Trinity Qt Interface is a library that abstracts Qt from Trinity
- This allows the Trinity code to rapidly port from one version of Qt to another.
- This is primarily accomplished by defining old functions in terms of new functions,
- although some code has been added for useful functions that are no longer part of Qt.
-
-Package: libtqtinterface-dev
-Architecture: all
-Multi-Arch: foreign
-Section: libs
-Replaces: libtqtinterface-dev (<< 4:14.0.0~)
-Breaks: libtqtinterface-dev (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt3-apps-dev
-Description: The Trinity Qt Interface Libraries (Development Files)
- The Trinity Qt Interface is a library that abstracts Qt from Trinity
- This allows the Trinity code to rapidly port from one version of Qt to another.
- This is primarily accomplished by defining old functions in terms of new functions,
- although some code has been added for useful functions that are no longer part of Qt.
-
-Package: libtqtinterface-doc
-Architecture: all
-Multi-Arch: foreign
-Section: libs
-Replaces: libtqtinterface-doc (<< 4:14.0.0~)
-Breaks: libtqtinterface-doc (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt3-doc
-Description: The Trinity Qt Interface Libraries (Debug Files)
- The Trinity Qt Interface is a library that abstracts Qt from Trinity
- This allows the Trinity code to rapidly port from one version of Qt to another.
- This is primarily accomplished by defining old functions in terms of new functions,
- although some code has been added for useful functions that are no longer part of Qt.
-
-Package: libtqtinterface-dbg
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libtqtinterface-dbg (<< 4:14.0.0~)
-Breaks: libtqtinterface-dbg (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libtqtinterface (>= ${source:Version}), tqt-x11-free-dbg
-Description: The Trinity Qt Interface Libraries (Debug Files)
- The Trinity Qt Interface is a library that abstracts Qt from Trinity
- This allows the Trinity code to rapidly port from one version of Qt to another.
- This is primarily accomplished by defining old functions in terms of new functions,
- although some code has been added for useful functions that are no longer part of Qt.
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/copyright b/ubuntu/_base/dependencies/tqtinterface/debian/copyright
deleted file mode 100644
index 978e1bb3e..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/copyright
+++ /dev/null
@@ -1,25 +0,0 @@
-This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on
-Mon, 12 Jul 2010 03:58:00 -0600.
-
-Upstream Authors: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-
-Copyright:
-
-   Copyright    (c) 2010, Timothy Pearson
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991, or at
-   your option any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
deleted file mode 100644
index 8b19fb624..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/include /usr
-debian/tmp/usr/bin /usr
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface.install b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface.install
deleted file mode 100644
index f9610d9a2..000000000
--- a/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib /usr
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/compat b/ubuntu/_base/libraries/kipi-plugins/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/control b/ubuntu/_base/libraries/kipi-plugins/debian/control
index b8cda4910..cc197a09d 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/control
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, tdelibs14-trinity-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, pkg-config, tdelibs14-trinity-dev,
  libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev | libgpod-dev (>> 0.8.3-8),
  libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/rules b/ubuntu/_base/libraries/kipi-plugins/debian/rules
index 33f9bcbd5..bd1b8f368 100755
--- a/ubuntu/_base/libraries/kipi-plugins/debian/rules
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.mk
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/compat b/ubuntu/_base/libraries/libkdcraw/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/compat
+++ b/ubuntu/_base/libraries/libkdcraw/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control
index 1443f76ec..052bc5b88 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/control
+++ b/ubuntu/_base/libraries/libkdcraw/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
  liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
- libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el]
+ libomp-dev [amd64 arm64 armhf mips64el ppc64el riscv64]
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/docs b/ubuntu/_base/libraries/libkdcraw/debian/docs
index 50bd824bb..46a4ca718 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/docs
+++ b/ubuntu/_base/libraries/libkdcraw/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules
index f69d1ece9..b528f7025 100755
--- a/ubuntu/_base/libraries/libkdcraw/debian/rules
+++ b/ubuntu/_base/libraries/libkdcraw/debian/rules
@@ -1,8 +1,9 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
+
+HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF)
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
@@ -14,7 +15,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_ALL_OPTIONS="ON"
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_OPENMP="$(HAVE_OPENMP)"
 
 # add installed liblcms*-dev to libkdcraw3-trinity-dev depends
 common-binary-arch::
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/compat b/ubuntu/_base/libraries/libkexiv2/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/compat
+++ b/ubuntu/_base/libraries/libkexiv2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/control b/ubuntu/_base/libraries/libkexiv2/debian/control
index 1b45ed7a6..071b339e7 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/control
+++ b/ubuntu/_base/libraries/libkexiv2/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libexiv2-dev, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libexiv2-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/docs b/ubuntu/_base/libraries/libkexiv2/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/docs
+++ b/ubuntu/_base/libraries/libkexiv2/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/rules b/ubuntu/_base/libraries/libkexiv2/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/libraries/libkexiv2/debian/rules
+++ b/ubuntu/_base/libraries/libkexiv2/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkipi/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/libraries/libkipi/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/libraries/libkipi/debian/compat b/ubuntu/_base/libraries/libkipi/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkipi/debian/compat
+++ b/ubuntu/_base/libraries/libkipi/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkipi/debian/control b/ubuntu/_base/libraries/libkipi/debian/control
index 25396af2d..23696379c 100644
--- a/ubuntu/_base/libraries/libkipi/debian/control
+++ b/ubuntu/_base/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libexif-dev, tdelibs14-trinity-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libexif-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/_base/libraries/libkipi/debian/rules b/ubuntu/_base/libraries/libkipi/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/libraries/libkipi/debian/rules
+++ b/ubuntu/_base/libraries/libkipi/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/compat b/ubuntu/_base/libraries/libksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/compat
+++ b/ubuntu/_base/libraries/libksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/control b/ubuntu/_base/libraries/libksquirrel/debian/control
index e9b117bd0..7e561ae4f 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/control
+++ b/ubuntu/_base/libraries/libksquirrel/debian/control
@@ -3,13 +3,11 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: debhelper (>= 9~), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
- djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
- libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
- automake, autoconf, libtool, libltdl-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+  netpbm, libiconv-hook-dev, liblcms1-dev, libjpeg-dev, libjasper-dev,
+  libgif-dev, libtiff-dev, djvulibre-bin, fig2dev | transfig, libmng-dev, libwmf-dev,
+  libopenexr-dev, medcon, librsvg2-bin, ghostscript, x11proto-core-dev,
 Standards-Version: 3.8.4
-Homagepage: http://ksquirrel.sourceforge.net
 
 Package: libksquirrel0-trinity
 Architecture: any
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
index 9b1cac640..92d306bd5 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
+++ b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
@@ -1,3 +1,4 @@
 debian/tmp/opt/trinity/lib/libksquirrel-libs*.so.*
 debian/tmp/opt/trinity/lib/ksquirrel-libs/libkls*.so.*
 debian/tmp/opt/trinity/share/ksquirrel-libs/*
+debian/tmp/opt/trinity/share/man/man1/*
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
deleted file mode 100644
index 51c0b6a04..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-camera2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-camera2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-camera2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
deleted file mode 100644
index df2cd06d1..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png [OPTION]... [FILE]...
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH OPTIONS
-.TP
-.B  \-v
-Print verbose messages
-.TP
-.B  \-c
-Write image data to standard output
-.TP
-.B  \-e
-Extract embedded thumbnail image
-.TP
-.B  \-i
-Identify files without decoding them
-.TP
-.B  \-i -v
-Identify files and show metadata
-.TP
-.B  \-z
-Change file dates to camera timestamp
-.TP
-.B  \-w
-Use camera white balance, if possible
-.TP
-.B  \-a
-Average the whole image for white balance
-.TP
-.B  \-A <x y w h>
-Average a grey box for white balance
-.TP
-.B  \-r <r g b g>
-Set custom white balance
-.TP
-.B  \+M\/\-M
-Use/don't use an embedded color matrix
-.TP
-.B  \-C <r b>
-Correct chromatic aberration
-.TP
-.B  \-b <num>
-Adjust brightness (default = 1.0)
-.TP
-.B  \-n <num>
-Set threshold for wavelet denoising
-.TP
-.B  \-k <num>
-Set black point
-.TP
-.B  \-K <file>
-Subtract dark frame (16-bit raw PGM)
-.TP
-.B  \-H [0-9]
-Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)
-.TP
-.B  \-t [0-7]
-Flip image (0=none, 3=180, 5=90CCW, 6=90CW)
-.TP
-.B  \-o [0-5]
-Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)
-.TP
-.B  \-o <file>
-Apply output ICC profile from file
-.TP
-.B  \-p <file>
-Apply camera ICC profile from file or "embed"
-.TP
-.B  \-d
-Document mode (no color, no interpolation)
-.TP
-.B  \-D
-Document mode without scaling (totally raw)
-.TP
-.B  \-j
-Don't stretch or rotate raw pixels
-.TP
-.B  \-q [0-3]
-Set the interpolation quality
-.TP
-.B  \-h
-Half-size color image (twice as fast as "-q 0")
-.TP
-.B  \-f
-Interpolate RGGB as four colors
-.TP
-.B  \-m <num>
-Apply a 3x3 median filter to R-G and B-G
-.TP
-.B  \-s [0..N-1]
-Select one raw image or "all" from each file
-.TP
-.B  \-4
-Write 16-bit linear instead of 8-bit with gamma
-.TP
-.B  \-T
-Write TIFF instead of PPM
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
deleted file mode 100644
index cfe155b5a..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
deleted file mode 100644
index 9ddc44614..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-fig2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-fig2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-fig2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
deleted file mode 100644
index 4b1477bef..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-iff2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-iff2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-iff2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
deleted file mode 100644
index 81ce62873..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-leaf2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-leaf2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-leaf2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
deleted file mode 100644
index 6b38ef8da..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm-s 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm-s
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm-s
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
deleted file mode 100644
index 21109a348..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm [ -v -h ] [ inFile [outFile] ]
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
deleted file mode 100644
index 26aa84076..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-mac2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-mac2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-mac2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
deleted file mode 100644
index fcd6d5171..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-neo2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-neo2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-neo2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
deleted file mode 100644
index ba620502c..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi12ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi12ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi12ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
deleted file mode 100644
index d662bec23..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi32ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi32ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi32ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
deleted file mode 100644
index 585d8cb36..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-svg2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-svg2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-svg2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
deleted file mode 100644
index 7c0950acd..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ttf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ttf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ttf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
deleted file mode 100644
index ddec06008..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-utah2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-utah2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-utah2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
deleted file mode 100644
index 3148b5faa..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xcf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xcf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xcf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
deleted file mode 100644
index 041fdb9ed..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xim2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xim2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xim2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/patches/series b/ubuntu/_base/libraries/libksquirrel/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/libraries/libksquirrel/debian/patches/series
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/rules b/ubuntu/_base/libraries/libksquirrel/debian/rules
index d761aa0a1..85fad4bc5 100755
--- a/ubuntu/_base/libraries/libksquirrel/debian/rules
+++ b/ubuntu/_base/libraries/libksquirrel/debian/rules
@@ -1,110 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-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)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-config.status: configure
-	dh_testdir
-
-configure:
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub admin/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess admin/config.guess
-endif
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath 
-# Tricks for Intrepid
-#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/ksquirrel.sgml > ksquirrel.1
-
-	touch $@
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/ksquirrel.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/tde.mk
+
+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" \
+ -DBUILD_PICT="OFF" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/watch b/ubuntu/_base/libraries/libksquirrel/debian/watch
deleted file mode 100644
index d9b799728..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/ksquirrel/ksquirrel-libs-(.+).tar.bz2
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/compat b/ubuntu/_base/libraries/libtdeldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/compat
+++ b/ubuntu/_base/libraries/libtdeldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/control b/ubuntu/_base/libraries/libtdeldap/debian/control
index 0bedee5d7..74907f0d9 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/control
+++ b/ubuntu/_base/libraries/libtdeldap/debian/control
@@ -2,7 +2,7 @@ Source: libtdeldap-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev
 Standards-Version: 3.8.4
 
 Package: libtdeldap-trinity
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/docs b/ubuntu/_base/libraries/libtdeldap/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/docs
+++ b/ubuntu/_base/libraries/libtdeldap/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/rules b/ubuntu/_base/libraries/libtdeldap/debian/rules
index 5a0da42af..b2d712d83 100755
--- a/ubuntu/_base/libraries/libtdeldap/debian/rules
+++ b/ubuntu/_base/libraries/libtdeldap/debian/rules
@@ -1,8 +1,7 @@
 #!/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
+-include /usr/share/cdbs/1/class/tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/compat b/ubuntu/_base/libraries/libtqt-perl/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libtqt-perl/debian/compat
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/control b/ubuntu/_base/libraries/libtqt-perl/debian/control
index 38d07566e..534f1d694 100644
--- a/ubuntu/_base/libraries/libtqt-perl/debian/control
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs14-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, libtqt3-mt-dev, perl (>= 5.8.0), automake, autoconf, tdelibs14-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/rules b/ubuntu/_base/libraries/libtqt-perl/debian/rules
index c498ce8ca..85d92e923 100755
--- a/ubuntu/_base/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/rules
@@ -24,7 +24,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--prefix=/opt/trinity \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
-	--with-qt-dir=/usr/share/tqt3 \
 	--disable-rpath \
 
 DEB_MAKE_INSTALL_TARGET := install \
diff --git a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/ubuntu/_base/libraries/python-trinity/debian/changelog b/ubuntu/_base/libraries/pytde/debian/changelog
index 12485eccd..43df2609a 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/changelog
+++ b/ubuntu/_base/libraries/pytde/debian/changelog
@@ -1,4 +1,4 @@
-python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low
+pytde (3.16.3-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/ubuntu/_base/libraries/pytde/debian/compat b/ubuntu/_base/libraries/pytde/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/libraries/pytde/debian/control b/ubuntu/_base/libraries/pytde/debian/control
new file mode 100644
index 000000000..21081f33e
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/control
@@ -0,0 +1,52 @@
+Source: pytde
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 10~), libtqt3-mt-dev, dh-python, python3-all-dev, python3-all-dbg, python3-sip-tqt, python3-sip-tqt-dev, python3-sip-tqt-dbg, pytqt-dev, python3-pytqt-dbg, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
+
+Package: python3-pytde
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt
+Breaks: python-trinity-trinity (<< 4:14.1.0~)
+Provides: ${python3:Provides}
+Description: Trinity bindings for Python 3 [Trinity]
+ Python binding module that provides wide access to the Trinity API,
+ also known as PyTDE. Using this, you'll get (for example) classes
+ from kio, kjs, tdehtml and kprint.
+
+Package: python3-pytde-dbg
+Priority: extra
+Architecture: any
+Depends: python3-pytde (= ${binary:Version}), python3-all-dbg, python3-pytqt-dbg, ${shlibs:Depends}
+Description: Trinity bindings for Python 3 (debug extensions) [Trinity]
+ Python binding module that provides wide access to the Trinity API,
+ also known as PyTDE. Using this, you'll get (for example) classes
+ from kio, kjs, tdehtml and kprint.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: pytde-dev
+Section: python
+Architecture: all
+Replaces: python-trinity-trinity-dev (<< 4:14.1.0~)
+Breaks: python-trinity-trinity-dev (<< 4:14.1.0~)
+Depends: pytqt-tools, ${python3:Depends}
+Description: Trinity bindings for Python - Development files and scripts [Trinity]
+ Development .sip files with definitions of PyTDE classes. They
+ are needed to build PyTDE, but also as building blocks of other
+ packages based on them. 
+ The package also contains tdepyuic, a wrapper script around PyTQt's
+ user interface compiler.
+
+Package: pytde-doc
+Section: doc
+Architecture: all
+Replaces: python-trinity-trinity-doc (<< 4:14.1.0~)
+Breaks: python-trinity-trinity-doc (<< 4:14.1.0~)
+Description: Documentation and examples for PyTDE [Trinity]
+ General documentation and examples for PyTDE providing programming
+ tips and working code you can use to learn from.
diff --git a/ubuntu/_base/libraries/python-trinity/debian/copyright b/ubuntu/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/copyright
+++ b/ubuntu/_base/libraries/pytde/debian/copyright
diff --git a/ubuntu/_base/libraries/pytde/debian/patches/.gitignore b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/ubuntu/_base/libraries/pytde/debian/pytde-dev.dirs b/ubuntu/_base/libraries/pytde/debian/pytde-dev.dirs
new file mode 100644
index 000000000..d4b26d5db
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-dev.dirs
@@ -0,0 +1 @@
+usr/share/sip-tqt/trinity
diff --git a/ubuntu/_base/libraries/pytde/debian/pytde-dev.install b/ubuntu/_base/libraries/pytde/debian/pytde-dev.install
new file mode 100644
index 000000000..224c18bd2
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-dev.install
@@ -0,0 +1,2 @@
+sip/* usr/share/sip-tqt/trinity
+contrib/tdepyuic usr/bin/
diff --git a/ubuntu/_base/libraries/pytde/debian/pytde-doc.dirs b/ubuntu/_base/libraries/pytde/debian/pytde-doc.dirs
new file mode 100644
index 000000000..190e712a3
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-doc.dirs
@@ -0,0 +1,3 @@
+usr/share/doc/pytde-doc
+usr/share/doc/pytde-doc/examples
+usr/share/doc/pytde-doc/html
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/ubuntu/_base/libraries/pytde/debian/pytde-doc.doc-base
index bb9705168..4429e7518 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-doc.doc-base
@@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html
-Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html
+Index: /usr/share/doc/pytde-doc/html/index.html
+Files: /usr/share/doc/pytde-doc/html/*.html
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/ubuntu/_base/libraries/pytde/debian/pytde-doc.examples
index e39721e20..e39721e20 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-doc.examples
diff --git a/ubuntu/_base/libraries/pytde/debian/pytde-doc.install b/ubuntu/_base/libraries/pytde/debian/pytde-doc.install
new file mode 100644
index 000000000..484ad91a4
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/pytde-doc.install
@@ -0,0 +1 @@
+doc/* usr/share/doc/pytde-doc/html
diff --git a/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
new file mode 100644
index 000000000..c12c20788
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
@@ -0,0 +1,17 @@
+# import the sipconfig.py for the normal or the debug build
+
+import os
+import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages'))
+
+if 'd' in sys.abiflags:
+    try:
+        from pytdeconfig_d import *
+        from pytdeconfig_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed')
+else:
+    from pytdeconfig_nd import *
+    from pytdeconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/libraries/pytde/debian/python3-pytde.install b/ubuntu/_base/libraries/pytde/debian/python3-pytde.install
new file mode 100644
index 000000000..a3546ced0
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/python3-pytde.install
@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/*.so
+usr/lib/python3*/*-packages/dcop*.py
diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/pytde/debian/rules
index ddbb6b15f..7f50df023 100755
--- a/ubuntu/_base/libraries/python-trinity/debian/rules
+++ b/ubuntu/_base/libraries/pytde/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -21,10 +20,22 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-# This has to be exported to make some magic below work.
+export DEB_HOST_ARCH  		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export DH_OPTIONS
-export QTDIR=/usr/share/qt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
+
+-include /usr/share/python3/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+export TQTDIR=/usr/share/tqt3
+export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
 
 CXXFLAGS = -Wall -g
 
@@ -34,10 +45,7 @@ else
 	CXXFLAGS += -O2
 endif
 
-PYTHONS := $(shell pyversions -vr debian/control)
-DBG_PYTHONS := $(shell pyversions -vd)
-
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
+PYTHONS := $(shell py3versions -vr)
 
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -48,15 +56,15 @@ endif
 
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
-configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp)
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
 
 build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && python$* ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-		-e python$* \
-		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
+		-d /usr/lib/python$*/$(call py_sitename,$*) \
+		-v /usr/share/sip-tqt/trinity -j $(SPLIT)
 	touch $@
 
 dbg-build-%/configure-stamp:
@@ -64,11 +72,11 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-		-e python$* \
-		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
+		-d /usr/lib/python$*/$(call py_sitename,$*) \
+		-v /usr/share/sip-tqt/trinity -j $(SPLIT)
 	touch $@
 
-build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp)
+build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
 build-indep:
 
 build-%/build-stamp: build-%/configure-stamp
@@ -85,7 +93,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
-	rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%)
+	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
 
 #	remove autogenerated *mod.sip files and clean up sources
 	for moddir in sip/*;\
@@ -106,13 +114,11 @@ install-indep:
 	dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
 	for version in ${PYTHONS};\
 	do\
-		mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\
-		cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
-		cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\
-	done
-	for version in ${DBG_PYTHONS};\
-	do\
-		cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\
+		pylib=$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))");\
+		mkdir -p debian/pytde-dev/$$pylib;\
+		install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\
+		install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\
+		install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\
 	done
 
 install-arch:
@@ -124,25 +130,21 @@ install-arch:
 	for version in ${PYTHONS};\
 	do\
 		$(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
+		$(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python3-pytde-dbg;\
 	done
 
-	set -e; \
-        for version in ${DBG_PYTHONS}; do \
-		$(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\
-        done
-
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
-	mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
-	ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
-	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+	mkdir -p $(CURDIR)/debian/python3-pytde/opt/trinity/lib/
+	ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python3-pytde/opt/trinity/lib/
+	for i in $$(find debian/python3-*-dbg -name '*.so'); do \
 	  b=$$(basename $$i .so); \
 	  mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-*-dbg ! -type d \
+	find debian/python3-*-dbg ! -type d \
 		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
 
-	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+	find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
 
 
 # Must not depend on anything. This is to be called by
@@ -156,11 +158,11 @@ binary-common:
 	dh_installexamples
 	dh_link
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg
+	DH_OPTIONS= dh_strip -ppython3-pytde #--dbg-package=python3-pytde-dbg
 endif
 	dh_compress -X.py -X.ui -X.dtd
 	dh_fixperms
-	${DH_PYTHON2}
+	dh_python3 --no-dbg-cleaning --shebang=/usr/bin/python3
 	dh_installdeb
 	dh_shlibdeps -l /opt/trinity/lib
 	dh_gencontrol
diff --git a/ubuntu/_base/libraries/pytde/debian/source/format b/ubuntu/_base/libraries/pytde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/libraries/pytde/debian/source/options b/ubuntu/_base/libraries/pytde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/compat b/ubuntu/_base/libraries/pytdeextensions/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/control b/ubuntu/_base/libraries/pytdeextensions/debian/control
index a4e21c28e..99b49726b 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/control
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/control
@@ -3,18 +3,18 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool,
- libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev
+Build-Depends: cdbs, debhelper (>= 10~), chrpath, quilt, tdelibs-trinity, libtool-bin, libtool,
+ libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python3-pytde,
+ pytqt-dev, python3-sip-tqt-dev, dh-python, python3-all, python3-all-dev, python3-setuptools
 Standards-Version: 3.8.4
 
 Package: pytdeextensions-trinity
 Architecture: all
-Depends: ${python:Depends}
-Replaces: pykdeextensions-kde3 (<< 4:14.0.0~), pykdeextensions-trinity (<< 4:14.0.0~)
-Breaks: pykdeextensions-kde3 (<< 4:14.0.0~), pykdeextensions-trinity (<< 4:14.0.0~)
+Depends: ${python3:Depends}
+Replaces: pykdeextensions-trinity (<< 4:14.0.0~)
+Breaks: pykdeextensions-trinity (<< 4:14.0.0~)
 Conflicts: pykdeextensions
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Description: Python packages to support TDE applications (scripts) [Trinity]
  PyTDE Extensions is a collection of software and Python packages
  to support the creation and installation of TDE applications.
@@ -24,9 +24,9 @@ Description: Python packages to support TDE applications (scripts) [Trinity]
 Package: libpythonize0-trinity-dev
 Architecture: any
 Section: libdevel
-Replaces: libpythonize0-kde3-dev (<< 4:14.0.0~), libpythonize0-trinity-dev (<< 4:14.0.0~)
-Breaks: libpythonize0-kde3-dev (<< 4:14.0.0~), libpythonize0-trinity-dev (<< 4:14.0.0~)
-Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev
+Replaces: libpythonize0-trinity-dev (<< 4:14.0.0~)
+Breaks: libpythonize0-trinity-dev (<< 4:14.0.0~)
+Depends: libpythonize0-trinity (= ${binary:Version}), python3-all-dev
 Description: Python packages to support TDE applications (development) [Trinity]
  PyTDE Extensions is a collection of software and Python packages
  to support the creation and installation of TDE applications.
@@ -38,8 +38,8 @@ Description: Python packages to support TDE applications (development) [Trinity]
 Package: libpythonize0-trinity
 Architecture: any
 Section: libs
-Replaces: libpythonize0-kde3 (<< 4:14.0.0~), libpythonize0-trinity (<< 4:14.0.0~)
-Breaks: libpythonize0-kde3 (<< 4:14.0.0~), libpythonize0-trinity (<< 4:14.0.0~)
+Replaces: libpythonize0-trinity (<< 4:14.0.0~)
+Breaks: libpythonize0-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpythonize0
 Description: Python packages to support TDE applications (library) [Trinity]
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
deleted file mode 100644
index 1a1ec9a8e..000000000
--- a/ubuntu/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-#   This class is designed to work with Python packages using the
-#   'distutils' build system and comply to the new policy established
-#   during summer 2006.  Use of the debhelper class to make use of the
-#   new dh_python is strongly advised.  (This is still left as optional
-#   in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy.  Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior.  The pysupport and
-# pycentral methods are available to comply with new policy.  Don't forget
-# to update your 'debian/control'.  (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
-  ifeq (, $(cdbs_selected_pycompat))
-    cdbs_pycompat = 2
-  endif # use pycompat
-  # warning pysupport compatibility mode
-  ifneq (, $(cdbs_use_xs_field))
-    $(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
-  endif # use XS field (compat)
-else
-  ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
-    ifeq (, $(cdbs_selected_pycompat))
-      cdbs_pycompat = 2
-    endif # use pycompat
-  else
-    ifneq (, $(DEB_PYTHON_SYSTEM))
-      $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
-    else
-      ifneq (, $(cdbs_use_xs_field))
-        $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-      endif
-      ifneq (, $(cdbs_selected_pycompat))
-        ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
-          $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
-        endif
-      endif # use pycompat
-    endif # unknown method
-  endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION = 
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr 
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating.  Here is some documentation:)
-$(warning   http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning   http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'.  Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-	for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
-	  sdir=$$(dirname $$ddir)/site-packages; \
-	  mkdir -p $$sdir; \
-	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
-	  rm -rf $$ddir; \
-	done
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command.  Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule.  In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
-	-python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : 
-	-python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
-  # check if current is in build versions
-  ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
-    cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
-    cdbs_python_build_versions := $(cdbs_python_compile_version)
-  else
-    cdbs_python_build_versions := $(cdbs_python_current_version)
-  endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
-  ifneq (, $(cdbs_python_compile_version))
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
-  else
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
-  endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
-	touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
-	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# This class can optionally use debhelper's commands.  Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-	dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-else
-	dh_pycentral -p$(cdbs_curpkg)
-endif
-	${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
-	echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
-	rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
-	find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/pyversions b/ubuntu/_base/libraries/pytdeextensions/debian/pyversions
deleted file mode 100644
index b3dc41ebc..000000000
--- a/ubuntu/_base/libraries/pytdeextensions/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules
index a9c996c88..d4a300abe 100755
--- a/ubuntu/_base/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules
@@ -1,28 +1,14 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  include debian/python-distutils-jaunty.mk
-else
-  include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
-DEB_PYTHON_INSTALL_ARGS_ALL += \
+export PYBUILD_INSTALL_ARGS += \
     --install-clib=/opt/trinity/lib \
     --install-cheaders=/opt/trinity/include
 
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include
 
@@ -36,38 +22,5 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-post-patches::
-	# make sure that python binary exists
-	# since the existing code is still dependent on python2
-	# and cdbs uses python as the default binary name
-	test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-install/pytdeextensions-trinity::
-	# We have no idea if the built product is site-packages or dist-packages
-	cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"
-	rm -rf debian/tmp/usr/lib/python*/site-packages/
-
-	# install lintian overrides
-	install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \
-	  debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity
-
-	# fix script-not-executable
-	find debian -type f -name '*.py' | xargs chmod 0755
-
-	# remove extra-license-file
-	find debian -type f -name 'COPYING' | xargs rm -f
-
-	# remove  byte-compiled file
-	find . -type f -name '*.py[co]' | xargs rm -f
-
-install/libpythonize0-trinity::
-	# fix binary-or-shlib-defines-rpath
-	chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
-
-clean::
-	rm -rf build
-	rm -f doc/en/*html doc/en/*bz2
-	rm -f install_log.txt
-
-	# remove  byte-compiled file
-	find . -type f -name '*.py[co]' | xargs rm -f
+%:
+	dh $@ --buildsystem=pybuild
diff --git a/ubuntu/_base/libraries/python-trinity/debian/compat b/ubuntu/_base/libraries/python-trinity/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/python-trinity/debian/control
deleted file mode 100644
index ccaad6fb3..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/control
+++ /dev/null
@@ -1,56 +0,0 @@
-Source: python-trinity-trinity
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) | dh-python, python-all, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
-Standards-Version: 3.8.4
-Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
-
-Package: python-trinity-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
-Replaces: python-kde3-kde3 (<< 4:14.0.0~), python-trinity-trinity (<< 4:14.0.0~)
-Breaks: python-kde3-kde3 (<< 4:14.0.0~), python-trinity-trinity (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Conflicts: python-trinity-trinity
-Description: Trinity bindings for Python [Trinity]
- Python binding module that provides wide access to the Trinity API,
- also known as PyTDE. Using this, you'll get (for example) classes
- from kio, kjs, tdehtml and kprint.
-
-Package: python-trinity-trinity-dbg
-Priority: extra
-Architecture: any
-Replaces: python-kde3-kde3-dbg (<< 4:14.0.0~), python-trinity-trinity-dbg (<< 4:14.0.0~)
-Breaks: python-kde3-kde3-dbg (<< 4:14.0.0~), python-trinity-trinity-dbg (<< 4:14.0.0~)
-Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-tqt-dbg, ${shlibs:Depends}
-Description: Trinity bindings for Python (debug extensions) [Trinity]
- Python binding module that provides wide access to the Trinity API,
- also known as PyTDE. Using this, you'll get (for example) classes
- from kio, kjs, tdehtml and kprint.
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-trinity-trinity-dev
-Section: python
-Architecture: all
-Replaces: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:14.0.0~)
-Breaks: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:14.0.0~)
-Depends: pytqt-tools, ${python:Depends}
-Description: Trinity bindings for Python - Development files and scripts [Trinity]
- Development .sip files with definitions of PyTDE classes. They
- are needed to build PyTDE, but also as building blocks of other
- packages based on them. 
- The package also contains tdepyuic, a wrapper script around PyTQt's
- user interface compiler.
-
-Package: python-trinity-trinity-doc
-Section: doc
-Architecture: all
-Replaces: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~)
-Breaks: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~)
-Description: Documentation and examples for PyTDE [Trinity]
- General documentation and examples for PyTDE providing programming
- tips and working code you can use to learn from.
diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py b/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
deleted file mode 100644
index eac264752..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
-    try:
-        from pytdeconfig_d import *
-    except ImportError, msg:
-        raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed'
-else:
-    from pytdeconfig_nd import *
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
deleted file mode 100644
index c395de89f..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-opt/trinity/share/sip/trinity
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
deleted file mode 100644
index f7d970bcb..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-sip/* opt/trinity/share/sip/trinity
-contrib/tdepyuic opt/trinity/bin/
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
deleted file mode 100644
index 96235463f..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/doc/python-trinity-trinity-doc
-usr/share/doc/python-trinity-trinity-doc/examples
-usr/share/doc/python-trinity-trinity-doc/html
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
deleted file mode 100644
index 20b273acb..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/* usr/share/doc/python-trinity-trinity-doc/html
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
deleted file mode 100644
index facee2907..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python*/*-packages/*.so
-usr/lib/python*/*-packages/dcop*.py
-
diff --git a/ubuntu/_base/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/python-trinity/debian/watch
deleted file mode 100644
index 8b3afcac0..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/compat b/ubuntu/_base/metapackages/casper-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/casper-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/control b/ubuntu/_base/metapackages/casper-trinity/debian/control
index fb2167089..5971ee27b 100644
--- a/ubuntu/_base/metapackages/casper-trinity/debian/control
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/control
@@ -2,7 +2,7 @@ Source: casper-trinity
 Section: misc
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
 Standards-Version: 3.8.4
 
 Package: casper-trinity
diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/rules b/ubuntu/_base/metapackages/casper-trinity/debian/rules
index 013e64a11..b24baa17c 100755
--- a/ubuntu/_base/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/rules
@@ -12,7 +12,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-build: debian/stamp-distrospecific
+pre-build:: debian/stamp-distrospecific
 
 debian/stamp-distrospecific:
 	dh_testdir
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/Makefile b/ubuntu/_base/metapackages/kubuntu-default-settings/Makefile
index 21080b3cd..21080b3cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/Makefile
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/Makefile
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/background.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/head.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/head.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/head.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/stylesheet.css
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1024x768.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
index 59160bb19..59160bb19 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1024x768.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x1024.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
index 4e2bce26e..4e2bce26e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x1024.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x800.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
index 68815abac..68815abac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x800.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1440x900.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
index 3e44742a4..3e44742a4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1440x900.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1600x1200.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
index f6166c447..f6166c447 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1600x1200.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1080.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
index 8902b4dfa..8902b4dfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1080.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1200.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1200.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/index.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/index.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/index.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_admin.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_away.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_away.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_away.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_halfop.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_op.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_op.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_op.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_owner.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_voice.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Dialog.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Preview.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
index 47b686406..47b686406 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Theme.rc
index 913cbfbe8..913cbfbe8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Theme.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-login.ogg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-panel.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-panel.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-panel.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
index 8ace65f4f..8ace65f4f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/background.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/default.css b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/default.css
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/default.css
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/head.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/head.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/head.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/layout.html b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/layout.html
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/layout.html
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
index 3e4862941..3e4862941 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
index d8fbd800f..d8fbd800f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
index e6b628f3c..e6b628f3c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
index bd4437f97..bd4437f97 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
index 085ef86b7..085ef86b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/kubuntu.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/kubuntu.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
index 440bf6f43..440bf6f43 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index 10ce5cc52..10ce5cc52 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Makefile.am b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
index 078e370a5..078e370a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Makefile.am
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enterprise.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
index cf8aecd32..cf8aecd32 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enterprise.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/preview.png
index f7712d7d2..f7712d7d2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/preview.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_over.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/gear.3ds b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/gear.3ds
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/gear.3ds
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/backgroundrc b/ubuntu/_base/metapackages/kubuntu-default-settings/backgroundrc
index ca9ca66bb..ca9ca66bb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/backgroundrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/backgroundrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
index d710e7edf..d710e7edf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/link
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/move
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/index.theme b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/index.theme
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/index.theme
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
index bae0ab8af..6cbdc9f2b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
@@ -2,13 +2,13 @@ Source: kubuntu-default-settings-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
 Standards-Version: 3.8.4
 
 Package: kubuntu-default-settings-trinity
 Architecture: all
 Depends: crystalcursors
-Conflicts: kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings, kubuntu-settings-desktop
 Recommends: tdmtheme-trinity, kubuntu-tdm-themes
 Description: Default settings and artwork for the Ubuntu Trinity desktop
  This package contains the default settings used by Ubuntu [Trinity].  It also
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
index 3727a65c1..22d39ff4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
@@ -32,6 +32,9 @@ case "$1" in
   upgrade)
         ;;
 
+  abort-install)
+        ;;
+
   *)
 	echo "Unknown argument ($1) for $0"
     ;;
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index 77e73faf8..77e73faf8 100755
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
index 6bc424f8e..6bc424f8e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/metapackages/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
index 105c4f692..105c4f692 120000
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen128.png b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen128.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen128.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen64.png b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen64.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen64.png
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-home b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-home
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-home
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/hidden-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/hidden-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/hidden-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_managerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_notifierrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/amarokrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/amarokrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/amarokrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/arkrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/arkrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/arkrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
index e54b81f63..e54b81f63 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/cryptodefaults
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/d3lphinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3brc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3brc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3brc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kaffeinerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katapultrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katapultrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katapultrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kbookmarkrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
index a0209401b..a0209401b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdeglobals
index 502972019..502972019 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdesktoprc
index 41ae7dfb3..41ae7dfb3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kgpgrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kgpgrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kgpgrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/khelpcenterrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kickerrc
index eaab006e6..eaab006e6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/klipperrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/klipperrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/klipperrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmailrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmailrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmailrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmixrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmixrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmixrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmplayerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knemorc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knemorc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knemorc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotesrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotesrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotesrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konqiconviewrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konsolerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konsolerc
index 2e4e63301..2e4e63301 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konsolerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konsolerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kontactrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kontactrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kontactrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konversationrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konversationrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konversationrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kopeterc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kopeterc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kopeterc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/korgacrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/korgacrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/korgacrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kscdrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kscdrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kscdrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ksplashrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ksplashrc
index b9b3b4707..b9b3b4707 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ksplashrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ksplashrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ktiprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ktiprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ktiprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuserrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuserrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuserrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
index e31c7d266..e31c7d266 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/metabarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/metabarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/metabarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/profilerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/profilerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/profilerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/skimrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/skimrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/skimrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdelaunchrc
index ac8e4ce06..ac8e4ce06 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdewalletrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twincrystalrc
index 14134537d..14134537d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twincrystalrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twinrc
index bf263a870..bf263a870 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/uiserver b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/uiserver
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/uiserver
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/yakuakerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/yakuakerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/yakuakerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-home
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/hidden-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/katerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
index 08ce6c33e..08ce6c33e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
index 96e6b3c15..96e6b3c15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/part.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/part.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/part.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-7z.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-7z.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-7z.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-ace.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-ace.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-ace.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arc.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arc.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arc.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-archive.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-archive.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-archive.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arj.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arj.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arj.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip2.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-compress.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-compress.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-compress.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-cpio.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-gzip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lha.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lha.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lha.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lzop.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-pak.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-pak.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-pak.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-rar.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-rar.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-rar.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tar.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tar.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tar.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tarz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tbz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tgz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tzo.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zoo.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/kstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/kstylerc
index 6c639810f..6c639810f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/kstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/kstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/lipstikstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/polyesterstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qtcurve-rc-files/stylerc
index 73c2faa15..73c2faa15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qtcurve-rc-files/stylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/kde4rc b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/kde4rc
index d08a1fe0b..d08a1fe0b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/kde4rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tde-user-profile b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tde-user-profile
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tderc b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tderc
index 8bb08502d..8bb08502d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tderc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tderc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl b/ubuntu/_base/metapackages/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/_base/metapackages/kubuntu-default-settings/tdmdistrc
index 65425be5f..65425be5f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdmdistrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tdmdistrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/konqueror.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/control b/ubuntu/_base/metapackages/kubuntu-meta/debian/control
index a3b436fe6..97afd7339 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 9~)
+Build-Depends: debhelper (>= 10~)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 66762e775..eb8489e38 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
@@ -12,9 +12,7 @@ Task-Key: kubuntu-desktop
 
 Power management:
 
- * acpi-support
  * (powernowd)
- * powermanagement-interface [i386 amd64 powerpc ia64]
 
 Bluetooth:
 
@@ -24,7 +22,7 @@ Bluetooth:
 == i386, i686, amd64 ==
 
  * acpi
- * acpid
+ * acpi-support | systemd | elogind
  * apmd [i386]
 
 == ppc32, ppc64 ==
@@ -65,17 +63,17 @@ These packages help with system integration
 
 Printing and printer configuration is a real weak spot in Debian, and in Linux in general. We will need to stay at the front of the curve here.
 
- * cupsys                       # our preferred printer management infrastructure
- * cupsys-bsd                   # gives us lpc, lpq, lpr, lprm
- * cupsys-client                # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
+ * cups                         # our preferred printer management infrastructure
+ * cups-bsd                     # gives us lpc, lpq, lpr, lprm
+ * cups-client                  # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
  * foomatic-db-engine           # integrate the foomatic printer driver engine
  * foomatic-db                  # the foomatic printer driver database
  * foomatic-filters             # converter from postscript to printer-specific formats
- * foomatic-db-hpijs            # printer drivers from the hp inkjet project
- * cupsys-driver-gutenprint     # a ton of cupsys ppds, for real comprehensive printer support
  * openprinting-ppds            # Most common drivers we want in desktop; less common are in o-p-extra
+ * (printer-driver-gutenprint|foomatic-db-gutenprint)	# a ton of cups ppds, for real comprehensive printer support
  * printer-driver-pnm2ppa|pnm2ppa	# several ppds require this
- * (hplip)				# support for HP all-in-one printers
+ * (printer-driver-hpcups|hplip)	# support for HP all-in-one printers
+ * (printer-driver-hpijs|foomatic-db-hpijs)	# printer drivers from the hp inkjet project
  * (printer-driver-min12xxw|min12xxw)	# support for KonicaMinolta PagePro 1200W, 1300W printers
  * (printer-driver-foo2zjs|foo2zjs)	# support for printing to ZjStream-based printers
  * (printer-driver-c2esp)		# support for Kodak ESP AiO color inkjet Series
@@ -323,8 +321,3 @@ to compile a driver. -mdz
 # * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent)
  * (landscape-client)
  * readahead
-
-= Germinate workarounds =
-
- * libglut3 # depended upon by freeglut3
- * libgl1-mesa-glx # depended upon by freeglut3
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
index 77cb3dd4c..4813b0c7a 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
@@ -1,5 +1,4 @@
-acpid
-acpi-support
+acpi-support | systemd | elogind
 alsa-utils
 anacron
 ark-trinity
@@ -39,13 +38,9 @@ ksvg-trinity
 ksystemlog-trinity
 lftp
 libarts1-akode-trinity
-libgl1-mesa-glx
-libglut3 | freeglut3
 libsasl2-modules
 libtqt-perl
 openprinting-ppds
-powermanagement-interface
-printer-driver-gutenprint | cups-driver-gutenprint
 printer-driver-pnm2ppa | pnm2ppa
 screen
 sudo-trinity
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
index 94566224e..891392f78 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
@@ -22,15 +22,11 @@ fonts-takao-gothic | ttf-takao-gothic
 fonts-takao-mincho | ttf-takao-mincho
 fonts-thai-tlwg | ttf-thai-tlwg
 fonts-unfonts-core | ttf-unfonts-core
-foomatic-db-gutenprint
 fortune-mod
 gcc
 gtk-qt-engine-trinity
 gtk3-tqt-engine-trinity
 gwenview-trinity
-hpijs-ppds
-hplip
-ijsgutenprint
 jockey-gtk
 k3b-trinity
 kaddressbook-trinity
@@ -85,6 +81,9 @@ plymouth-theme-kubuntu-logo-trinity
 powernowd
 printer-driver-c2esp
 printer-driver-foo2zjs | foo2zjs
+printer-driver-gutenprint | foomatic-db-gutenprint
+printer-driver-hpcups | hplip
+printer-driver-hpijs | hpijs-ppds
 printer-driver-min12xxw | min12xxw
 printer-driver-ptouch
 printer-driver-pxljr | pxljr
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/rules b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
index 62403e808..83fa6c233 100755
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
@@ -82,4 +82,4 @@ binary-indep:
 
 binary: binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean checkroot build
+.PHONY: build-arch binary binary-arch binary-indep clean checkroot build
diff --git a/ubuntu/_base/metapackages/tde-cdbs b/ubuntu/_base/metapackages/tde-cdbs
new file mode 120000
index 000000000..0b5e202da
--- /dev/null
+++ b/ubuntu/_base/metapackages/tde-cdbs
@@ -0,0 +1 @@
+../../../debian/_base/metapackages/tde-cdbs
\ No newline at end of file
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
deleted file mode 100644
index c0e67bf63..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-tde-ubuntu-integration (0.1-0) maverick; urgency=low
-
-  * Initial version
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 08 Aug 2011 13:03:00 -0600
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
deleted file mode 100644
index 0ce0cb566..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: tde-ubuntu-integration
-Section: kde
-Priority: extra
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
-Standards-Version: 3.8.4
-
-Package: tde-ubuntu-integration
-Architecture: all
-Depends: policykit-1-gnome
-Description: TDE Ubuntu Integration
- Ubuntu integration for TDE
- This includes files needed for Polkit to function correctly under TDE
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
deleted file mode 100644
index ee19d5d17..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
deleted file mode 100644
index 7720f1ca8..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Comment=PolicyKit Authentication Agent
-Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=TDE;
-X-TDE-AutoRestart=true
-X-Ubuntu-Gettext-Domain=polkit-gnome-1
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install
deleted file mode 100644
index 3853fc64c..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop	etc/xdg/autostart
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
deleted file mode 100755
index 013e64a11..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-build: debian/stamp-distrospecific
-
-debian/stamp-distrospecific:
-	dh_testdir
-	[ -e debian/stamp-distrospecific ] || \
-	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
-	tee debian/stamp-distrospecific | \
-	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
-
-clean::
-	dh_testdir
-	[ ! -e debian/stamp-distrospecific ] || \
-	cat debian/stamp-distrospecific | \
-	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
-	rm -f debian/stamp-distrospecific
diff --git a/ubuntu/_base/metapackages/trinity-livecd/debian/compat b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/trinity-livecd/debian/compat
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/trinity-livecd/debian/control b/ubuntu/_base/metapackages/trinity-livecd/debian/control
index 5db45e692..dbc04c749 100644
--- a/ubuntu/_base/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Standards-Version: 3.8.3
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
 
 Package: trinity-livecd
 Architecture: all
diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/control b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
index 4db5384c2..8de47d41a 100644
--- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
@@ -2,7 +2,7 @@ Source: ubiquity-trinity
 Section: admin
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
 Standards-Version: 3.8.4
 
 Package: ubiquity-trinity
diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules
index 013e64a11..b24baa17c 100755
--- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules
@@ -12,7 +12,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-build: debian/stamp-distrospecific
+pre-build:: debian/stamp-distrospecific
 
 debian/stamp-distrospecific:
 	dh_testdir
diff --git a/ubuntu/groovy b/ubuntu/jammy
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/groovy
+++ b/ubuntu/jammy
diff --git a/ubuntu/hirsute b/ubuntu/noble
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/hirsute
+++ b/ubuntu/noble
diff --git a/ubuntu/impish b/ubuntu/oracular
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/impish
+++ b/ubuntu/oracular
diff --git a/ubuntu/trusty b/ubuntu/plucky
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/trusty
+++ b/ubuntu/plucky
diff --git a/ubuntu/xenial b/ubuntu/questing
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/xenial
+++ b/ubuntu/questing