DEB build scripts: updated distros and added htdig to extra dependencies.

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 21 insertions, 38 deletions

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 227c642f2..82edb1404 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -10,15 +10,16 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
   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/htdig"
   build_module "$CFG_EXTRA_DEPS_DIR/imlib"
-#  build_module "$CFG_EXTRA_DEPS_DIR/opensync"   # deprecated - no longer required in R14.1 series. To remove in R14.2.0
-  build_module "$CFG_EXTRA_DEPS_DIR/lcms"
-  build_module "$CFG_EXTRA_DEPS_DIR/wv2"
   build_module "$CFG_EXTRA_DEPS_DIR/jasper"
-  build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
+  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
 
 set_log_end
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 5b30176e2..6c6dc6f25 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -45,35 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz"
 #-- select apt components
 case "$DISTRIBUTION" in
   # debian
-	jessie)
-		if [[ "$DISTRO" = "devuan" ]]; then
-			COMPONENTS="main"
-			DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
-			EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
-		else
-			COMPONENTS="main contrib non-free"
-		fi
-		;;
-
 	sid|bookwork|bullseye|buster|stretch)
 		COMPONENTS="main contrib non-free"
 		;;
 
   # devuan
-	ceres|chimaera|beowulf|ascii)
+	ceres|daedalus|chimaera|beowulf|ascii)
 		COMPONENTS="main"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
 		;;
 
   # ubuntu
-	impish|hirsute|groovy|focal|bionic|xenial|trusty)
+	jammy|impish|hirsute|groovy|focal|bionic|xenial)
 		COMPONENTS="main restricted universe multiverse"
 		DEBOOTSTRAPOPTS=(--variant=buildd)
 		;;
 
   # raspbian
-	raspbian-bullseye|raspbian-buster|raspbian-stretch)
+	raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
 		COMPONENTS="main contrib non-free"
 		DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
 		;;
@@ -87,21 +77,13 @@ case "$DISTRIBUTION" in
 		MIRRORSITE=http://deb.debian.org/debian
 		;;
 
-	jessie)
-		if [[ "$DISTRO" = "devuan" ]]; then
-			MIRRORSITE=http://auto.mirror.devuan.org/merged
-		else
-			MIRRORSITE=http://deb.debian.org/debian
-		fi
-		;;
-
   # devuan
-	ceres|chimaera|beowulf|ascii)
+	ceres|daedalus|chimaera|beowulf|ascii)
 		MIRRORSITE=http://auto.mirror.devuan.org/merged
 		;;
 
   # ubuntu
-	impish|hirsute|groovy|focal|bionic|xenial|trusty)
+	jammy|impish|hirsute|groovy|focal|bionic|xenial)
 		if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
 			MIRRORSITE=http://archive.ubuntu.com/ubuntu
 		else
@@ -110,7 +92,7 @@ case "$DISTRIBUTION" in
 		;;
 
   # raspbian
-	raspbian-bullseye|raspbian-buster|raspbian-stretch)
+	raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
 		MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
 		;;
 esac
@@ -145,14 +127,14 @@ fi
 #-- aptitude is better if target distribution contains apt < 1.4~beta3
 case "$DISTRIBUTION" in
   sid|bookwork|bullseye|buster|stretch|\
-  ceres|chimaera|beowulf|ascii|\
-  raspbian-bullseye|raspbian-buster|raspbian-stretch|\
-  impish|hirsute|groovy|focal|bionic)
+  ceres|daedalus|chimaera|beowulf|ascii|\
+  raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch|\
+  jammy|impish|hirsute|groovy|focal|bionic)
     PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
     ;;
 
-  jessie|\
-  xenial|trusty)
+  xenial)
     PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude"
     ;;
 esac
+
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index 54b3446ae..0bcb3fe81 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -10,7 +10,6 @@
 #
 
 # debian
-debian     8.0    jessie             -   -
 debian     9.0    stretch            -   -
 debian    10.0    buster             -   -
 debian    11.0    bullseye           -   -
@@ -20,8 +19,9 @@ debian    13.0    sid                ~b  -
 # devuan
 devuan     2.0    ascii              -   debian/stretch
 devuan     3.0    beowulf            -   debian/buster
-devuan     4.0    chimaera           ~a  debian/bullseye
-devuan     5.0    ceres              ~b  debian/sid
+devuan     4.0    chimaera           -   debian/bullseye
+devuan     5.0    daedalus           ~a  debian/bookwork
+devuan     6.0    ceres              ~b  debian/sid
 
 # raspbian
 raspbian   9.0    raspbian-stretch   -   -
@@ -30,10 +30,10 @@ raspbian  11.0    raspbian-bullseye  -   -
 raspbian  12.0    raspbian-bookworm  ~a  -
 
 # ubuntu
-ubuntu    14.04   trusty             -   -
 ubuntu    16.04   xenial             -   -
 ubuntu    18.04   bionic             -   -
 ubuntu    20.04   focal              -   -
 ubuntu    20.10   groovy             -   -
 ubuntu    21.04   hirsute            -   -
-ubuntu    21.10   impish             ~a  -
+ubuntu    21.10   impish             -   -
+ubuntu    22.04   jammy              ~a  -