26 files changed, 38 insertions, 28 deletions
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control
index 79617857e..cae29f6a7 100644
--- a/debian/_base/applications/settings/kmyfirewall/debian/control
+++ b/debian/_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 (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kmyfirewall.sourceforge.net/
 
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules
index 76a0f44d3..a6797f19a 100755
--- a/debian/_base/applications/settings/kmyfirewall/debian/rules
+++ b/debian/_base/applications/settings/kmyfirewall/debian/rules
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-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
-	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/debian/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/debian-tde.mk
index aba508624..aba508624 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/versions.pl b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/changelog b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
index ee7e1976f..574e76971 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/changelog
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
@@ -1,4 +1,4 @@
-xdg-desktop-portals-trinity (0.1-0) unstable; urgency=low
+xdg-desktop-portal-trinity (0.1-0) unstable; urgency=low
 
   * Initial release for TDE
 
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/compat b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/compat
index f599e28b8..f599e28b8 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/compat
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/compat
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/control b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/control
index 6606e071b..83bdda0cd 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/control
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/control
@@ -1,12 +1,15 @@
-Source: xdg-desktop-portals-trinity
+Source: xdg-desktop-portal-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 
-Package: xdg-desktop-portals-trinity
+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/debian/_base/applications/system/xdg-desktop-portals-tde/debian/copyright b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
index 7943bd7ff..7943bd7ff 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/copyright
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/docs b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/docs
index b43bf86b5..b43bf86b5 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/docs
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/docs
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/patches/series b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/patches/series
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/rules b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules
index 5a0da42af..5a0da42af 100755
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/rules
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/source/format b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/source/format
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
diff --git a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/source/options b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/system/xdg-desktop-portals-tde/debian/source/options
+++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/source/options
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
index 5c4cc4d06..bd8bcd2c2 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 (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: 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/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
index 76a0f44d3..a6797f19a 100755
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-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
-	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/system/xdg-desktop-portals-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/debian-tde.mk
index aba508624..aba508624 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/changelog b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
index ee7e1976f..574e76971 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/changelog
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/changelog
@@ -1,4 +1,4 @@
-xdg-desktop-portals-trinity (0.1-0) unstable; urgency=low
+xdg-desktop-portal-trinity (0.1-0) unstable; urgency=low
 
   * Initial release for TDE
 
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/compat b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/compat
index f599e28b8..f599e28b8 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/compat
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/compat
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/control b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/control
index 6606e071b..83bdda0cd 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/control
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/control
@@ -1,12 +1,15 @@
-Source: xdg-desktop-portals-trinity
+Source: xdg-desktop-portal-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
 
-Package: xdg-desktop-portals-trinity
+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-portals-tde/debian/copyright b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
index 7943bd7ff..7943bd7ff 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/copyright
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/copyright
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/docs b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/docs
index b43bf86b5..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/docs
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/docs
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/patches/series b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/patches/series
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/rules b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules
index 5a0da42af..5a0da42af 100755
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/rules
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/source/format b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/source/format
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/format
diff --git a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/source/options b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/system/xdg-desktop-portals-tde/debian/source/options
+++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/source/options