DEB build scripts: updated after testing on Devuan Chimaera

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

2 files changed, 12 insertions, 12 deletions

diff --git a/debian/_buildscripts/local/internals/_config_template.sh b/debian/_buildscripts/local/internals/_config_template.sh
index 232d99799..7c1e929c6 100644
--- a/debian/_buildscripts/local/internals/_config_template.sh
+++ b/debian/_buildscripts/local/internals/_config_template.sh
@@ -5,8 +5,8 @@ set -a
 #----------------------------
 # Repo information
 #----------------------------
-TDE_DIR=""         							  # TDE root folder
-UPDATE_BRANCHES="master"				  # Space separated list. Available choices: master, r14.0.x
+TDE_DIR=""                        # TDE root folder
+UPDATE_BRANCHES="master"          # Space separated list. Available choices: master, r14.1.x
 DEFAULT_REPO_BRANCH="master"      # After update in completed, switch repo to this branch. Must be
                                   # one of the branches specified in UPDATE_BRANCHES
 
@@ -14,12 +14,12 @@ DEFAULT_REPO_BRANCH="master"      # After update in completed, switch repo to th
 # Build information
 #----------------------------
 TDE_RELEASE="14.1.0"              # TDE release number
-DISTRO=""									  			# Distro family (leave empty for auto-detection). For ex. debian
-DISTRO_NAME=""              			# Distro name of specific version (leave empty for auto-detection). For ex. buster
-ARCHITECTURE=""              			# Build for this architecture (leave empty for auto-detection). For ex. amd64
+DISTRO=""                         # Distro family (leave empty for auto-detection). For ex. debian
+DISTRO_NAME=""                    # Distro name of specific version (leave empty for auto-detection). For ex. buster
+ARCHITECTURE=""                   # Build for this architecture (leave empty for auto-detection). For ex. amd64
 USE_PREBUILD_EXTRA_DEPS="y"       # If == "y", use pre-built extra dependency packages
 BUILD_DEFAULT_OPTIONS="-g -lr"    # Default building options (pbuilder)
-GPG_SIGN_KEYID=""								  # Use this GPG key to sign packages. If null, packages will not be signed
+GPG_SIGN_KEYID=""                 # Use this GPG key to sign packages. If null, packages will not be signed
 
 #----------------------------
 # Base directories
@@ -28,7 +28,7 @@ CFG_SCRIPT_LOG_DIR="0_logs"
 CFG_GIT_DIR="1_git"
 CFG_BUILD_DIR="2_build"
 CFG_REPO_DIR="3_repo"
-CFG_EXTRA_DEPS_DIR="edeps"			  # Relative to CFG_GIT_DIR folder. Only required if USE_PREBUILD_EXTRA_DEPS != "y"
-CFG_HOOKS_DIR="hooks"     			  # Relative to CFG_GIT_DIR folder
+CFG_EXTRA_DEPS_DIR="edeps"        # Relative to CFG_GIT_DIR folder. Only required if USE_PREBUILD_EXTRA_DEPS != "y"
+CFG_HOOKS_DIR="hooks"             # Relative to CFG_GIT_DIR folder
 
 set +a
diff --git a/debian/_buildscripts/local/internals/_pbuilder.sh b/debian/_buildscripts/local/internals/_pbuilder.sh
index 5f00e718a..b520a93af 100755
--- a/debian/_buildscripts/local/internals/_pbuilder.sh
+++ b/debian/_buildscripts/local/internals/_pbuilder.sh
@@ -57,9 +57,9 @@ END_D05_02
       while read l_branch l_repo l_component; do
         if [ "$l_branch" = "default" ]; then
           bool_EDEPS_FOUND="y"
-          cat <<END_D05_02 >> "$PBUILDER_DEPS_HOOK"
+          cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK"
 echo "deb [trusted=yes] $l_repo $DISTRO_NAME $l_component" >> /etc/apt/sources.list
-END_D05_02
+END_D05_03
           break
         fi
       done <<< $(cat "$SCRIPT_DIR/internals/extra_deps.txt" | grep -E "^[[:space:]]*[^#[:space:]]+[[:space:]]+[^[:space:]]+.*$")
@@ -67,9 +67,9 @@ END_D05_02
       IFS=$OLD_IFS
     fi
   fi
-  cat <<END_D05_03 >> "$PBUILDER_DEPS_HOOK"
+  cat <<END_D05_04 >> "$PBUILDER_DEPS_HOOK"
 apt-get update
-END_D05_03
+END_D05_04
   chmod a+x "$PBUILDER_DEPS_HOOK"
   # Build
   OPT_BUILD_PARALLEL=""