DEB build scripts: update to latest distros and repo structure

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

7 files changed, 30 insertions, 25 deletions

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_pre_base.sh
index ec5aa1b54..082c47224 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_pre_base.sh
@@ -5,6 +5,9 @@
 #----------------------------
 set_log_start
 
+build_module "metapackages/tde-cdbs"
+build_module "dependencies/tde-cmake"
+
 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"
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index 53f605d88..6ffe8ee1c 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -5,8 +5,6 @@
 #----------------------------
 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"
diff --git a/debian/_buildscripts/local/09_apps_development.sh b/debian/_buildscripts/local/09_apps_development.sh
index cb876661f..1d913e4f2 100755
--- a/debian/_buildscripts/local/09_apps_development.sh
+++ b/debian/_buildscripts/local/09_apps_development.sh
@@ -13,6 +13,7 @@ build_module "applications/development/ktechlab"
 build_module "applications/development/kxmleditor"
 build_module "applications/development/piklab"
 build_module "applications/development/tdesvn"
+build_module "applications/development/tdexsldbg"
 build_module "applications/development/universal-indent-gui-tqt"
 
 set_log_end
diff --git a/debian/_buildscripts/local/91_build_base.sh b/debian/_buildscripts/local/91_build_base.sh
index b53ba9048..d83f9d544 100755
--- a/debian/_buildscripts/local/91_build_base.sh
+++ b/debian/_buildscripts/local/91_build_base.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
-	./00_extradeps.sh
-fi
+./00_pre_base.sh
 ./01_base_01.sh
 ./02_base_02.sh
 ./03_base_03.sh
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index efe932b93..7eff414db 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -45,25 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz"
 #-- select apt components
 case "$DISTRIBUTION" in
   # debian
-	sid|trixie|bookwork|bullseye|buster)
+	sid|forky|trixie|bookwork|bullseye)
 		COMPONENTS="main contrib non-free"
 		;;
 
   # devuan
-	ceres|excalibur|daedalus|chimaera|beowulf)
+	ceres|excalibur|daedalus|chimaera)
 		COMPONENTS="main"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
 		;;
 
   # ubuntu
-	oracular|noble|mantic|lunar|jammy|focal|bionic)
+	questing|plucky|oracular|noble|jammy|focal|bionic)
 		COMPONENTS="main restricted universe multiverse"
 		DEBOOTSTRAPOPTS=(--variant=buildd)
 		;;
 
   # raspbian
-	raspbian-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster)
+	raspbian-trixie|raspbian-bookworm|raspbian-bullseye)
 		COMPONENTS="main contrib non-free"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		;;
@@ -73,17 +73,17 @@ EXTRAPACKAGES="$EXTRAPACKAGES fakeroot apt-transport-https ca-certificates"
 #-- select base apt sources
 case "$DISTRIBUTION" in
   # debian
-	sid|trixie|bookwork|bullseye|buster)
+	sid|forky|trixie|bookwork|bullseye)
 		MIRRORSITE=http://deb.debian.org/debian
 		;;
 
   # devuan
-	ceres|excalibur|daedalus|chimaera|beowulf)
-		MIRRORSITE=http://auto.mirror.devuan.org/merged
+	ceres|excalibur|daedalus|chimaera)
+		MIRRORSITE=https://pkgmaster.devuan.org/merged
 		;;
 
   # ubuntu
-	oracular|noble|mantic|lunar|jammy|focal|bionic)
+	questing|plucky|oracular|noble|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-trixie|raspbian-bookworm|raspbian-bullseye|raspbian-buster)
+	raspbian-trixie|raspbian-bookworm|raspbian-bullseye)
 		MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
 		;;
 esac
@@ -118,4 +118,5 @@ if [ -z "$DEB_SIGN_KEYID" ]; then
 fi
 
 #-- dependency solver
-PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
+#PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
+PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-classic"
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 515303ebe..ab97c2198 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -82,7 +82,13 @@ function search_module()
 		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 [[ "$str" == */* ]]; then
+			# Module name contains path too
+			LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"`
+		else
+			# Module name only, no path. Search for exact name match
+			LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "/$LOC_MOD_NAME$"`
+		fi
 		if [ "$LOC_MATCH" != ""  -a  "`echo $LOC_MATCH | wc -l`" = "1" ]; then
 			# Unique module
 			MODULE_FOUND="y"
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index ef1104eb9..440b8bd94 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -10,30 +10,28 @@
 #
 
 # debian
-debian    10.0    buster             -   -
 debian    11.0    bullseye           -   -
 debian    12.0    bookworm           -   -
-debian    13.0    trixie             ~a  -
-debian    14.0    sid                ~b  -
+debian    13.0    trixie             -   -
+debian    14.0    forky              ~a  -
+debian    15.0    sid                ~b  -
 
 # devuan
-devuan     3.0    beowulf            -   debian/buster
 devuan     4.0    chimaera           -   debian/bullseye
 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  -   -
-raspbian  13.0    raspbian-trixie    ~a  -
+raspbian  13.0    raspbian-trixie    -   -
 
 # ubuntu
 ubuntu    18.04   bionic             -   -
 ubuntu    20.04   focal              -   -
 ubuntu    22.04   jammy              -   -
-ubuntu    23.04   lunar              -   -
-ubuntu    23.10   mantic             -   -
 ubuntu    24.04   noble              -   -
-ubuntu    24.10   oracular           ~a  -
+ubuntu    24.10   oracular           -   -
+ubuntu    25.04   plucky             -   -
+ubuntu    25.10   questing           ~a  -