DEB tde-guidance: switch to cmake build system

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 303 insertions, 416 deletions

diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..b031e6981
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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_ALL += .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-guidance/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
index d5fa67b98..547203533 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/control
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/control
@@ -4,15 +4,13 @@ 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 (>= 10~), 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, pytqt-dev, python3-pytqt, python3-pytde, pytde-dev, python3-sip-tqt-dev,
- dh-python, python3-all, python3-all-dev, x11proto-scrnsaver-dev, hwdata
+Build-Depends: 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}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, init | sysv-rc, guidance-backends-trinity, hwdata, python3-all, python3-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
@@ -31,7 +29,7 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
 
 Package: guidance-backends-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, hwdata, python3-all, python3-all-dev
+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
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
index 724e08449..ca0272abf 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
@@ -1,2 +1,3 @@
+AUTHORS
 README
 TODO
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/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
index 908924c49..a6797f19a 100755
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
@@ -1,138 +1,17 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON3_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
-GUIDANCE_INST_PATH = /usr/lib/python3/dist-packages/tde-guidance
-export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.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)$(GUIDANCE_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
-
-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)/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 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 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)
-
-	# move python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)
-
-        # fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/fuser.py
-
-	# Replace all '#!' calls to python with /usr/bin/python3
-	# and make them executable
-	for i in `find $(PYSUPPORT_PATH) -type f`; do \
-		sed -i '1s|#!.*python[^ ]*\(.*\)|#!/usr/bin/python3\1|' $$i; \
-	done
-
-binary-install/tde-guidance-trinity::
-	dh_python3 -p $(cdbs_curpkg)
-
-install/guidance-backends-trinity::
-	mkdir -p $(PYSUPPORT_PATH)
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)
-
-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/cmake.mk
+include debian/cdbs/debian-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/tde-guidance-trinity.docs b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
@@ -0,0 +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 2c427e763..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,59 +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/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/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/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/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
-usr/lib/python3/dist-packages/tde-guidance/SMBShareSelectDialog.py
-usr/lib/python3/dist-packages/tde-guidance/SimpleCommandRunner.py
-usr/lib/python3/dist-packages/tde-guidance/fuser.py
-usr/lib/python3/dist-packages/tde-guidance/fuser_ui.py
-usr/lib/python3/dist-packages/tde-guidance/mountconfig.py
-usr/lib/python3/dist-packages/tde-guidance/serviceconfig.py
-usr/lib/python3/dist-packages/tde-guidance/sizeview.py
-usr/lib/python3/dist-packages/tde-guidance/unixauthdb.py
-usr/lib/python3/dist-packages/tde-guidance/userconfig.py
-opt/trinity/lib/trinity/kcm_serviceconfig.so
-opt/trinity/lib/trinity/kcm_userconfig.so
-opt/trinity/lib/trinity/kcm_mountconfig.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.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).