10 files changed, 7 insertions, 10 deletions
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
index c06024081..301b290e0 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -236,7 +236,6 @@ 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
@@ -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
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 27a96c2b4..ec5aa1b54 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -9,7 +9,6 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
   echo -e "${CBrown}####  Use of pre-built extra dependency packages is currently configured. Nothing to do.  ####\n${CNone}"
   echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
 else
-  build_module "$CFG_EXTRA_DEPS_DIR/uncrustify-trinity"
 	#
   build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
   build_module "$CFG_EXTRA_DEPS_DIR/gettext-kde"
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index 02fd3924c..53f605d88 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -5,15 +5,15 @@
 #----------------------------
 set_log_start
 
+build_module "metapackages/tde-cdbs"
 build_module "dependencies/tde-cmake"
 build_module "dependencies/libr"
 build_module "dependencies/akode"
 build_module "dependencies/libart-lgpl"
 build_module "dependencies/libcaldav"
 build_module "dependencies/libcarddav"
-build_module "dependencies/tqt3"
+build_module "dependencies/tqt"
 build_module "dependencies/arts"
-build_module "dependencies/dbus-tqt"
 build_module "dependencies/dbus-1-tqt"
 build_module "dependencies/tqca"
 build_module "dependencies/avahi-tqt"
diff --git a/debian/_buildscripts/local/07_apps_settings.sh b/debian/_buildscripts/local/07_apps_settings.sh
index a637949b9..065d45e40 100755
--- a/debian/_buildscripts/local/07_apps_settings.sh
+++ b/debian/_buildscripts/local/07_apps_settings.sh
@@ -13,6 +13,7 @@ build_module "applications/settings/klcddimmer"
 build_module "applications/settings/kmyfirewall"
 build_module "applications/settings/tde-guidance"
 build_module "applications/settings/tde-systemsettings"
+build_module "applications/settings/tdealternatives"
 build_module "applications/settings/tdenetworkmanager"
 build_module "applications/settings/tdesudo"
 build_module "applications/settings/wlassistant"
diff --git a/debian/_buildscripts/local/10_apps_games.sh b/debian/_buildscripts/local/10_apps_games.sh
index 09290d0c0..72d3869f5 100755
--- a/debian/_buildscripts/local/10_apps_games.sh
+++ b/debian/_buildscripts/local/10_apps_games.sh
@@ -6,6 +6,7 @@
 set_log_start
 
 build_module "applications/games/knights"
+build_module "applications/games/tdeknighttour"
 build_module "applications/games/tdepacman"
 
 set_log_end
diff --git a/debian/_buildscripts/local/13_apps_multimedia.sh b/debian/_buildscripts/local/13_apps_multimedia.sh
index b679ab72a..ae54294ec 100755
--- a/debian/_buildscripts/local/13_apps_multimedia.sh
+++ b/debian/_buildscripts/local/13_apps_multimedia.sh
@@ -11,7 +11,6 @@ build_module "applications/multimedia/k3b"
 build_module "applications/multimedia/k3b-i18n"
 build_module "applications/multimedia/k9copy"
 build_module "applications/multimedia/kaffeine"
-build_module "applications/multimedia/kaffeine-mozilla"
 build_module "applications/multimedia/kmplayer"
 build_module "applications/multimedia/kplayer"
 build_module "applications/multimedia/mplayerthumbs"
diff --git a/debian/buster b/debian/forky
index e7c887a6f..e7c887a6f 120000
--- a/debian/buster
+++ b/debian/forky
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
index c1c48181e..cae5bfd82 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -236,7 +236,6 @@ debian/tmp/usr/include/tdeprint/kprintdialogpage.h
 debian/tmp/usr/include/tdeprint/lpr/lprhandler.h
 debian/tmp/usr/include/tdeprint/lpr/lprsettings.h
 debian/tmp/usr/include/tdeprint/lpr/printcapentry.h
-debian/tmp/usr/include/kdesktopfile.h
 debian/tmp/usr/include/tdedesktopfile.h
 debian/tmp/usr/include/tdesu/client.h
 debian/tmp/usr/include/tdesu/defaults.h
@@ -325,7 +324,7 @@ debian/tmp/usr/include/kimiface.h
 debian/tmp/usr/include/tdeimproxy.h
 debian/tmp/usr/include/tdeimproxyiface.h
 debian/tmp/usr/include/kinputdialog.h
-debian/tmp/usr/include/kinstance.h
+debian/tmp/usr/include/tdeinstance.h
 debian/tmp/usr/include/tdeio/authinfo.h
 debian/tmp/usr/include/tdeiobuffer.h
 debian/tmp/usr/include/tdeio/chmodjob.h
diff --git a/gentoo b/gentoo
-Subproject 8c414a87212d43fe4f73486c5788a7efe3320dd
+Subproject 40545d581ffb066aa24ae9b55050b184538f749
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
index c06024081..301b290e0 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -236,7 +236,6 @@ 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
@@ -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