DEB buildscripts:

1. update supported distros
2. fixed update of local submodules with worktrees
3. update list of modules to be built

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

8 files changed, 44 insertions, 29 deletions

diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index e291ed8e5..1dda656e2 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -18,6 +18,7 @@ build_module "dependencies/libart-lgpl"
 build_module "dependencies/avahi-tqt"
 build_module "dependencies/libcaldav"
 build_module "dependencies/libcarddav"
+build_module "dependencies/polkit-tqt"
 if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
   # needs cmake-trinity so must be build after common/cmake module
   build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"  
diff --git a/debian/_buildscripts/local/02_base_02.sh b/debian/_buildscripts/local/02_base_02.sh
index 61c500d36..abe995014 100755
--- a/debian/_buildscripts/local/02_base_02.sh
+++ b/debian/_buildscripts/local/02_base_02.sh
@@ -7,8 +7,8 @@ set_log_start
 
 build_module "dependencies/sip4-tqt"
 build_module "dependencies/tqscintilla"
-build_module "dependencies/python-tqt"
-build_module "libraries/python-trinity"
+build_module "dependencies/pytqt"
+build_module "libraries/pytde"
 build_module "libraries/pytdeextensions"
 build_module "core/tdebindings"
 build_module "libraries/libtqt-perl"
diff --git a/debian/_buildscripts/local/05_apps_system.sh b/debian/_buildscripts/local/05_apps_system.sh
index fa3d861a6..a7fdb1c33 100755
--- a/debian/_buildscripts/local/05_apps_system.sh
+++ b/debian/_buildscripts/local/05_apps_system.sh
@@ -19,10 +19,12 @@ build_module "applications/system/krusader"
 build_module "applications/system/kshutdown"
 build_module "applications/system/ksystemlog"
 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/tdedocker"
 build_module "applications/system/tdepowersave"
+build_module "applications/system/tdesshaskpass"
 build_module "applications/system/yakuake"
 
 set_log_end
diff --git a/debian/_buildscripts/local/07_apps_settings.sh b/debian/_buildscripts/local/07_apps_settings.sh
index f20a83bc6..a637949b9 100755
--- a/debian/_buildscripts/local/07_apps_settings.sh
+++ b/debian/_buildscripts/local/07_apps_settings.sh
@@ -12,9 +12,9 @@ build_module "applications/settings/kkbswitch"
 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/tdenetworkmanager"
 build_module "applications/settings/tdesudo"
-build_module "applications/settings/tde-systemsettings"
 build_module "applications/settings/wlassistant"
 
 set_log_end
diff --git a/debian/_buildscripts/local/14_apps_tdeio.sh b/debian/_buildscripts/local/14_apps_tdeio.sh
index ad588b66d..d50b03a5c 100755
--- a/debian/_buildscripts/local/14_apps_tdeio.sh
+++ b/debian/_buildscripts/local/14_apps_tdeio.sh
@@ -5,6 +5,7 @@
 #----------------------------
 set_log_start
 
+build_module "applications/tdeio/tdeio-appinfo"
 build_module "applications/tdeio/tdeio-apt"
 build_module "applications/tdeio/tdeio-ftps"
 build_module "applications/tdeio/tdeio-gopher"
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 6c6dc6f25..e95cefafe 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -57,7 +57,7 @@ case "$DISTRIBUTION" in
 		;;
 
   # ubuntu
-	jammy|impish|hirsute|groovy|focal|bionic|xenial)
+	kinetic|jammy|impish|hirsute|focal|bionic|xenial)
 		COMPONENTS="main restricted universe multiverse"
 		DEBOOTSTRAPOPTS=(--variant=buildd)
 		;;
@@ -83,7 +83,7 @@ case "$DISTRIBUTION" in
 		;;
 
   # ubuntu
-	jammy|impish|hirsute|groovy|focal|bionic|xenial)
+	kinetic|jammy|impish|hirsute|focal|bionic|xenial)
 		if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
 			MIRRORSITE=http://archive.ubuntu.com/ubuntu
 		else
@@ -129,7 +129,7 @@ case "$DISTRIBUTION" in
   sid|bookwork|bullseye|buster|stretch|\
   ceres|daedalus|chimaera|beowulf|ascii|\
   raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch|\
-  jammy|impish|hirsute|groovy|focal|bionic)
+	kinetic|jammy|impish|hirsute|focal|bionic)
     PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
     ;;
 
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 94fdab76a..c20661ad5 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -197,6 +197,7 @@ if [ "${bool_BUILD_FROM_PATH}" = "y" ]; then
 		else
 			MOD_NAME=`basename "${MOD_PATH}"`
 		fi
+echo "${MOD_NAME}"
 		if [ "${MOD_NAME}" != "" -a "${MOD_NAME}" != "tde" -a "${MOD_NAME}" != ".git" ]; then
 			# Valid git module
 			if [[ "${MOD_PATH}" =~ ${TDE_BUILD_DIR} ]]; then
@@ -309,6 +310,31 @@ if [ -d "$MOD_BUILD_PATH" ]; then
   $SUDO_CMD rm *.deb *.dsc *.changes *.tar.bz2 *.tar.gz *.tar.xz *.log *.buildinfo &>/dev/null
 fi
 
+# calculate package version, if needed
+if [ "$bool_EXTRADEP_MOD" != "y" ]; then
+  cd $MOD_GIT_PATH
+  branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
+  if [[ -z "$branch" ]]; then
+      branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
+  fi
+  target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1`
+  tag=`git tag | \
+    sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
+    while read t; do \
+    git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
+    echo "$t..HEAD" && break; done`
+  count=`git log $tag --pretty=oneline | wc -l`
+  pkgver=$TDE_RELEASE
+  if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
+    pkgver=$pkgver~pre$count+$(git rev-parse HEAD | cut -c 1-8)
+  fi
+	MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
+	if [[ -z "$MOD_BRANCH" ]]; then
+		MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
+	fi
+	COMMIT_HASH=`git rev-parse HEAD`
+fi
+
 # copy main repo source files, if needed
 if [ "$bool_COPY_MOD_SRC" = "y" ]; then
   bool_COPY_PKGING_FILES="y"
@@ -319,12 +345,7 @@ if [ "$bool_COPY_MOD_SRC" = "y" ]; then
     # Add GIT information
     echo "# TDE SCM module information" > "$MOD_BUILD_PATH/.tdescminfo"
     echo "Name: $MOD_NAME" >> "$MOD_BUILD_PATH/.tdescminfo"
-    cd "$MOD_GIT_PATH"
-    MOD_BRANCH=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
-    if [[ -z "$MOD_BRANCH" ]]; then
-      MOD_BRANCH=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
-    fi
-    COMMIT_HASH=`git rev-parse HEAD`
+    echo "Version: R$pkgver" >> "$MOD_BUILD_PATH/.tdescminfo"
     echo "Revision: $MOD_BRANCH-$COMMIT_HASH" >> "$MOD_BUILD_PATH/.tdescminfo"
     git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> "$MOD_BUILD_PATH/.tdescminfo"
   else
@@ -355,23 +376,7 @@ if [ "$bool_EXTRADEP_MOD" != "y"  -a  "$bool_COPY_PKGING_FILES" = "y" ]; then
   cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
 
   # Default package name
-  # Calculate package version
-  cd $MOD_GIT_PATH
-  branch=`git symbolic-ref -q HEAD | sed "s|^refs/heads/||"`
-  if [[ -z "$branch" ]]; then
-      branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-`
-  fi
-  target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1`
-  tag=`git tag | \
-    sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \
-    while read t; do \
-    git branch --contains $t | cut -c 3- | grep -x "$branch" >/dev/null && \
-    echo "$t..HEAD" && break; done`
-  count=`git log $tag --pretty=oneline | wc -l`
-  package=$(basename $PWD)-trinity-$TDE_RELEASE
-  if [[ "$count" -gt 0 ]] || [[ -z "$target_tag" ]]; then
-    package=$package~pre$count+$(git rev-parse HEAD | cut -c 1-8)
-  fi
+  package=$(basename $PWD)-trinity-$pkgver
   REL=4:$TDE_RELEASE${package#*$TDE_RELEASE}
   REL=${REL%+*}
   REL=${REL/4:14.0.0/4:14.0.0-s}
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index 4286393ef..57305c59d 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -283,6 +283,12 @@ function _do_worktree_update()
                 git branch -u "origin/${CURR_BR}" &>/dev/null #$
                 git reset --hard "origin/${CURR_BR}" &>/dev/null
               fi
+              # If this is a clone of a local repository, make sure to do a fetch
+              # operation first, otherwise this clone won't see the latest changes
+              if [ "`git config --get remote.origin.url`" = "${MOD_REPO_PATH}" ]; then
+                eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
+                eval git worktree prune $OPT_VERBOSE_LOG
+              fi
               # Update
               eval git reset --hard HEAD $OPT_VERBOSE_LOG
               eval git clean -dxff $OPT_VERBOSE_LOG