From fcc58c19e62d88e3bf38216c812a79313c2c73ff Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 28 Apr 2024 13:18:13 +0200
Subject: Merging debian version 20240420-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/progress-linux.config | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'debian/progress-linux.config')

diff --git a/debian/progress-linux.config b/debian/progress-linux.config
index 6939689..991cfd5 100755
--- a/debian/progress-linux.config
+++ b/debian/progress-linux.config
@@ -9,10 +9,21 @@ PROJECT="progress-linux"
 
 Run_debconf ()
 {
+	# non-free archive areas
+	case "${RELEASE}" in
+		5|6)
+			NON_FREE="non-free"
+			;;
+
+		*)
+			NON_FREE="non-free, non-free-firmware"
+			;;
+	esac
+
 	# debconf templates
 	db_subst ${PROJECT}/archives CHOICES "${NAME} ${RELEASE} (${CODENAME}), ${NAME} ${RELEASE} (${CODENAME}-security), ${NAME} ${RELEASE} (${CODENAME}-updates), ${NAME} ${RELEASE} (${CODENAME}-extras), ${NAME} ${RELEASE} (${CODENAME}-test), ${NAME} ${RELEASE}.99 (${CODENAME}-backports), ${NAME} ${RELEASE}.99 (${CODENAME}-backports-extras), ${NAME} ${RELEASE}.99 (${CODENAME}-backports-test)"
 	db_subst ${PROJECT}/archives CHOICES_C "${CODENAME}, ${CODENAME}-security, ${CODENAME}-updates, ${CODENAME}-extras, ${CODENAME}-test, ${CODENAME}-backports, ${CODENAME}-backports-extras, ${CODENAME}-backports-test"
-	db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, non-free, non-free-firmware, restricted"
+	db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, ${NON_FREE}, restricted"
 
 	# apt archives
 	db_settitle ${PROJECT}/title
@@ -39,35 +50,35 @@ PROGRESS_LINUX_VERSION="$(if [ -e /etc/progress-linux_version ]; then cat /etc/p
 if [ -n "${PROGRESS_LINUX_VERSION}" ]
 then
 	case "${PROGRESS_LINUX_VERSION}" in
-		5*)
+		5.*)
 			RELEASE="5"
 			CODENAME="engywuck"
 
 			Run_debconf
 			;;
 
-		6*)
+		6.*)
 			RELEASE="6"
 			CODENAME="fuchur"
 
 			Run_debconf
 			;;
 
-		7*)
+		7.*)
 			RELEASE="7"
 			CODENAME="graograman"
 
 			Run_debconf
 			;;
 
-		8*)
+		8.*)
 			RELEASE="8"
 			CODENAME="horok"
 
 			Run_debconf
 			;;
 
-		9*)
+		9.*)
 			RELEASE="9"
 			CODENAME="illuan"
 
-- 
cgit v1.2.3