DEB buildscripts: update supported ditros and application list

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

15 files changed, 90 insertions, 68 deletions

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 82edb1404..27a96c2b4 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -12,13 +12,12 @@ else
   build_module "$CFG_EXTRA_DEPS_DIR/uncrustify-trinity"
 	#
   build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
+  build_module "$CFG_EXTRA_DEPS_DIR/gettext-kde"
   build_module "$CFG_EXTRA_DEPS_DIR/htdig"
   build_module "$CFG_EXTRA_DEPS_DIR/imlib"
   build_module "$CFG_EXTRA_DEPS_DIR/jasper"
   build_module "$CFG_EXTRA_DEPS_DIR/lcms"
-  build_module "$CFG_EXTRA_DEPS_DIR/mp4v2"
   build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
-  build_module "$CFG_EXTRA_DEPS_DIR/transcode"
   build_module "$CFG_EXTRA_DEPS_DIR/wv2"
 fi
 
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index 46b04d832..02fd3924c 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -12,7 +12,6 @@ build_module "dependencies/libart-lgpl"
 build_module "dependencies/libcaldav"
 build_module "dependencies/libcarddav"
 build_module "dependencies/tqt3"
-build_module "dependencies/tqtinterface"
 build_module "dependencies/arts"
 build_module "dependencies/dbus-tqt"
 build_module "dependencies/dbus-1-tqt"
diff --git a/debian/_buildscripts/local/05_apps_system.sh b/debian/_buildscripts/local/05_apps_system.sh
index a7fdb1c33..4e851a121 100755
--- a/debian/_buildscripts/local/05_apps_system.sh
+++ b/debian/_buildscripts/local/05_apps_system.sh
@@ -22,9 +22,11 @@ build_module "applications/system/kvkbd"
 build_module "applications/system/polkit-agent-tde"
 build_module "applications/system/smartcardauth"
 build_module "applications/system/tastymenu"
+build_module "applications/system/tdebluez"
 build_module "applications/system/tdedocker"
 build_module "applications/system/tdepowersave"
 build_module "applications/system/tdesshaskpass"
+build_module "applications/system/xdg-desktop-portal-tde"
 build_module "applications/system/yakuake"
 
 set_log_end
diff --git a/debian/_buildscripts/local/06_apps_utilities.sh b/debian/_buildscripts/local/06_apps_utilities.sh
index c90ff66cc..eb3edc68e 100755
--- a/debian/_buildscripts/local/06_apps_utilities.sh
+++ b/debian/_buildscripts/local/06_apps_utilities.sh
@@ -13,6 +13,7 @@ build_module "applications/utilities/kcpuload"
 build_module "applications/utilities/kdirstat"
 build_module "applications/utilities/keep"
 build_module "applications/utilities/knutclient"
+build_module "applications/utilities/kommando"
 build_module "applications/utilities/kompose"
 build_module "applications/utilities/krename"
 build_module "applications/utilities/ksensors"
diff --git a/debian/_buildscripts/local/09_apps_development.sh b/debian/_buildscripts/local/09_apps_development.sh
index f5e41d1bf..cb876661f 100755
--- a/debian/_buildscripts/local/09_apps_development.sh
+++ b/debian/_buildscripts/local/09_apps_development.sh
@@ -13,5 +13,6 @@ build_module "applications/development/ktechlab"
 build_module "applications/development/kxmleditor"
 build_module "applications/development/piklab"
 build_module "applications/development/tdesvn"
+build_module "applications/development/universal-indent-gui-tqt"
 
 set_log_end
diff --git a/debian/_buildscripts/local/12_apps_office.sh b/debian/_buildscripts/local/12_apps_office.sh
index c9baaecd1..80f2cbd8f 100755
--- a/debian/_buildscripts/local/12_apps_office.sh
+++ b/debian/_buildscripts/local/12_apps_office.sh
@@ -14,6 +14,7 @@ build_module "applications/office/knowit"
 build_module "applications/office/koffice"
 build_module "applications/office/koffice-i18n"
 build_module "applications/office/keximdb"
+build_module "applications/office/tde-ebook-reader"
 build_module "applications/office/tellico"
 
 if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
diff --git a/debian/_buildscripts/local/13_apps_multimedia.sh b/debian/_buildscripts/local/13_apps_multimedia.sh
index 3c3dc30d4..b679ab72a 100755
--- a/debian/_buildscripts/local/13_apps_multimedia.sh
+++ b/debian/_buildscripts/local/13_apps_multimedia.sh
@@ -12,7 +12,7 @@ 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" # depends on koffice-trinity-dev
+build_module "applications/multimedia/kmplayer"
 build_module "applications/multimedia/kplayer"
 build_module "applications/multimedia/mplayerthumbs"
 build_module "applications/multimedia/rosegarden"
diff --git a/debian/_buildscripts/local/15_apps_themes.sh b/debian/_buildscripts/local/15_apps_themes.sh
index 8bffc9ab8..25bc06a34 100755
--- a/debian/_buildscripts/local/15_apps_themes.sh
+++ b/debian/_buildscripts/local/15_apps_themes.sh
@@ -9,15 +9,18 @@ build_module "applications/themes/gtk3-tqt-engine"
 build_module "applications/themes/gtk-qt-engine"
 build_module "applications/themes/kgtk-qt3"
 build_module "applications/themes/ksplash-engine-moodin"
-# build_module "applications/themes/qt4-tqt-theme-engine"
 build_module "applications/themes/tde-style-baghira"
 build_module "applications/themes/tde-style-domino"
 build_module "applications/themes/tde-style-ia-ora"
 build_module "applications/themes/tde-style-lipstik"
+build_module "applications/themes/tde-style-polyester"
 build_module "applications/themes/tde-style-qtcurve"
 build_module "applications/themes/tdmtheme"
 build_module "applications/themes/twin-style-crystal"
 build_module "applications/themes/twin-style-dekorator"
+build_module "applications/themes/twin-style-fahrenheit"
+build_module "applications/themes/twin-style-machbunt"
+build_module "applications/themes/twin-style-mallory"
 build_module "applications/themes/twin-style-suse2"
 
 set_log_end
diff --git a/debian/_buildscripts/local/16_apps_misc.sh b/debian/_buildscripts/local/16_apps_misc.sh
index ee6061311..f7f028ff3 100755
--- a/debian/_buildscripts/local/16_apps_misc.sh
+++ b/debian/_buildscripts/local/16_apps_misc.sh
@@ -19,7 +19,6 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
   build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-bcop-trinity"
   build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity"
   build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity"
-  build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity"
 fi
 build_module "applications/misc/compizconfig-backend-tdeconfig"
 
diff --git a/debian/_buildscripts/local/92_build_applications.sh b/debian/_buildscripts/local/92_build_applications.sh
index d16b5cc54..b617bc311 100755
--- a/debian/_buildscripts/local/92_build_applications.sh
+++ b/debian/_buildscripts/local/92_build_applications.sh
@@ -12,3 +12,4 @@
 ./14_apps_tdeio.sh
 ./15_apps_themes.sh
 ./16_apps_misc.sh
+./17_meta_packages.sh
diff --git a/debian/_buildscripts/local/99_build_TDE.sh b/debian/_buildscripts/local/99_build_TDE.sh
index 1a80862a6..45e85f97e 100755
--- a/debian/_buildscripts/local/99_build_TDE.sh
+++ b/debian/_buildscripts/local/99_build_TDE.sh
@@ -50,6 +50,5 @@ set_log_start
 
 ./91_build_base.sh
 ./92_build_applications.sh
-./17_meta_packages.sh
 
 set_log_end
diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt
index d2ed9fc7e..265205721 100644
--- a/debian/_buildscripts/local/README.txt
+++ b/debian/_buildscripts/local/README.txt
@@ -22,7 +22,7 @@ A) Environment preparation
      Different instructions will be provided where necessary, based on the choice made.
      More on this at point 9).
 
-1) Install following packages: bc, cdbs, git, pbuilder, rsync and required dependencies.
+1) Install following packages: bc, cdbs, git, pbuilder, quilt, rsync and required dependencies.
    NOTE: sudo should already be installed. If not, install sudo as well.
 
 2) Create a base folder for TDE, hereafter referred to as TDE_DIR (for example $HOME/tde_src)
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 52402895e..efe932b93 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -50,20 +50,20 @@ case "$DISTRIBUTION" in
 		;;
 
   # devuan
-	ceres|daedalus|chimaera|beowulf)
+	ceres|excalibur|daedalus|chimaera|beowulf)
 		COMPONENTS="main"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
 		;;
 
   # ubuntu
-	mantic|lunar|kinetic|jammy|focal|bionic)
+	oracular|noble|mantic|lunar|jammy|focal|bionic)
 		COMPONENTS="main restricted universe multiverse"
 		DEBOOTSTRAPOPTS=(--variant=buildd)
 		;;
 
   # raspbian
-	raspbian-bookworm|raspbian-bullseye|raspbian-buster)
+	raspbian-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster)
 		COMPONENTS="main contrib non-free"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		;;
@@ -78,12 +78,12 @@ case "$DISTRIBUTION" in
 		;;
 
   # devuan
-	ceres|daedalus|chimaera|beowulf)
-		MIRRORSITE=http://pkgmaster.devuan.org/merged
+	ceres|excalibur|daedalus|chimaera|beowulf)
+		MIRRORSITE=http://auto.mirror.devuan.org/merged
 		;;
 
   # ubuntu
-	mantic|lunar|kinetic|jammy|focal|bionic)
+	oracular|noble|mantic|lunar|jammy|focal|bionic)
 		if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
 			MIRRORSITE=http://archive.ubuntu.com/ubuntu
 		else
@@ -92,7 +92,7 @@ case "$DISTRIBUTION" in
 		;;
 
   # raspbian
-	raspbian-bookworm|raspbian-bullseye|raspbian-buster)
+	raspbian-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster)
 		MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
 		;;
 esac
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index e8ccec472..515303ebe 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -69,54 +69,55 @@ function search_module()
 
   MODULE_FOUND="n"
 
-  # Search in GIT repository
-  LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"`
-  if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
-    # Unique module
-    MODULE_FOUND="y"
-    MOD_NAME=$LOC_MATCH
-		if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then
-			MOD_GIT_PATH="$MOD_PATH"
+	# Check if it is a metapackage
+	LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^(metapackages/)?||"`
+	LOC_MATCH=`ls "$REPO_TDE_MAIN/metapackages" | grep "^$LOC_BASENAME\$"`
+	if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
+		# Unique metapackage found
+		MODULE_FOUND="y"
+    bool_METAPACKAGE_MOD="y"
+		MOD_NAME="metapackages/$LOC_MATCH"
+		MOD_GIT_PATH="$REPO_TDE_MAIN/metapackages/$LOC_BASENAME"
+		MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
+		MOD_BUILD_PATH="$TDE_BUILD_DIR/metapackages/$LOC_BASENAME"
+	else
+		# Search for unique GIT repository
+		LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"`
+		if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
+			# Unique module
+			MODULE_FOUND="y"
+			MOD_NAME=$LOC_MATCH
+			if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then
+				MOD_GIT_PATH="$MOD_PATH"
+			else
+				MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
+			fi
+			MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
+			MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME"
 		else
-			MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
+			# Search for a unique folder with the same name
+			if [ -d "${REPO_TDE_MAIN}/$LOC_MOD_NAME" ]; then
+				# Folder found
+				MODULE_FOUND="y"
+				MOD_NAME=$LOC_MOD_NAME
+				MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
+				MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
+				MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME"
+			else
+				# Search in extra dependency folder
+				LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"`
+				LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME\$"`
+				if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
+					# Unique module found
+					MODULE_FOUND="y"
+					bool_EXTRADEP_MOD="y"
+					MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH"
+					MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME"
+					MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME"
+				fi
+			fi
 		fi
-		MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
-    MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME"
-  else
-    # Search for a unique folder with the same name
-    if [ -d "${REPO_TDE_MAIN}/$LOC_MOD_NAME" ]; then
-      # Folder found
-      MODULE_FOUND="y"
-      MOD_NAME=$LOC_MOD_NAME
-      MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
-      MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
-      MOD_BUILD_PATH="$TDE_BUILD_DIR/$MOD_NAME"
-    else
-      # Search in extra dependency folder
-      LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"`
-      LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME\$"`
-      if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
-        # Unique module found
-        MODULE_FOUND="y"
-        bool_EXTRADEP_MOD="y"
-        MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH"
-        MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME"
-        MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME"
-      else
-        # Search in metapackages folder
-        LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^(metapackages/)?||"`
-        LOC_MATCH=`ls "$REPO_TDE_MAIN/metapackages" | grep "^$LOC_BASENAME\$"`
-        if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
-          # Unique module found
-          MODULE_FOUND="y"
-          MOD_NAME="metapackages/$LOC_MATCH"
-          MOD_GIT_PATH="$REPO_TDE_MAIN/metapackages/$LOC_BASENAME"
-          MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
-          MOD_BUILD_PATH="$TDE_BUILD_DIR/metapackages/$LOC_BASENAME"
-        fi
-      fi
-    fi
-  fi
+	fi
 	export MOD_BUILD_PATH
   MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian"
   IFS=$OLDIFS
@@ -131,6 +132,7 @@ bool_BUILD_FROM_GIT="n"
 bool_BUILD_FROM_PATH="n"
 bool_BUILD_LOCALLY="n"
 bool_EXTRADEP_MOD="n"
+bool_METAPACKAGE_MOD="n"
 bool_SHOW_BUILD_LOGS="n"
 bool_LOG_RESULT="n"
 bool_SHELL_HOOK="n"
@@ -359,7 +361,7 @@ if [ "$bool_COPY_MOD_SRC" = "y" ]; then
       QUILT_PATCHES="debian/patches" quilt push -a >/dev/null
       # Make sure patches are not reapplied in future local builds. This could stop pdebuild from working.
       if [ -f "$MOD_BUILD_PATH/debian/patches/series" ]; then
-        cp /dev/null "$MOD_BUILD_PATH/debian/patches/series"
+        rm "$MOD_BUILD_PATH/debian/patches/series"
       fi
     else
       echo "There must be one and only one module folder in \"$MOD_GIT_PATH\""
@@ -373,7 +375,19 @@ if [ "$bool_EXTRADEP_MOD" != "y"  -a  "$bool_COPY_PKGING_FILES" = "y" ]; then
   if [ -d "$MOD_BUILD_PKGING_PATH" ]; then
     $SUDO_CMD rm -R $MOD_BUILD_PKGING_PATH
   fi
-  cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
+  if [ "$bool_METAPACKAGE_MOD" = "y" ]; then
+    cp -R "$MOD_GIT_PKGING_PATH/.." "$MOD_BUILD_PATH"
+	else
+    cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
+	fi
+	if [[ -s "$MOD_BUILD_PKGING_PATH/patches/series" ]]; then
+		cd "$MOD_BUILD_PATH"
+		quilt push -a
+		# Make sure patches are not reapplied in future local builds. This could stop pdebuild from working.
+		if [ -f "$MOD_BUILD_PKGING_PATH/patches/series" ]; then
+			rm "$MOD_BUILD_PKGING_PATH/patches/series"
+		fi
+	fi
 
   # Default package name
   package=$(basename $PWD)-trinity-$pkgver
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index ba1dab204..ef1104eb9 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -19,18 +19,21 @@ debian    14.0    sid                ~b  -
 # devuan
 devuan     3.0    beowulf            -   debian/buster
 devuan     4.0    chimaera           -   debian/bullseye
-devuan     5.0    daedalus           ~a  debian/bookwork
-devuan     6.0    ceres              ~b  debian/sid
+devuan     5.0    daedalus           -   debian/bookwork
+devuan     6.0    excalibur          ~a  debian/trixie
+devuan     7.0    ceres              ~b  debian/sid
 
 # raspbian
 raspbian  10.0    raspbian-buster    -   -
 raspbian  11.0    raspbian-bullseye  -   -
-raspbian  12.0    raspbian-bookworm  ~a  -
+raspbian  12.0    raspbian-bookworm  -   -
+raspbian  13.0    raspbian-trixie    ~a  -
 
 # ubuntu
 ubuntu    18.04   bionic             -   -
 ubuntu    20.04   focal              -   -
 ubuntu    22.04   jammy              -   -
-ubuntu    22.10   kinetic            -   -
 ubuntu    23.04   lunar              -   -
-ubuntu    23.10   mantic             ~a  -
+ubuntu    23.10   mantic             -   -
+ubuntu    24.04   noble              -   -
+ubuntu    24.10   oracular           ~a  -