summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdebian/progress-linux.config2
-rwxr-xr-xdebian/progress-linux.postinst2
-rw-r--r--debian/progress-linux.templates4
3 files changed, 3 insertions, 5 deletions
diff --git a/debian/progress-linux.config b/debian/progress-linux.config
index 6655630..fc96575 100755
--- a/debian/progress-linux.config
+++ b/debian/progress-linux.config
@@ -28,10 +28,8 @@ case "${DISTRIBUTION}" in
10.*|buster/sid)
db_subst ${PROJECT}/archives CHOICES "Progress Linux 5 (engywuck), Progress Linux 5 (engywuck-security), Progress Linux 5 (engywuck-updates), Progress Linux 5 (engywuck-extras), Progress Linux 5+ (engywuck-backports), Progress Linux 5+ (engywuck-backports-extras)"
db_subst ${PROJECT}/archives CHOICES_C "engywuck, engywuck-security, engywuck-updates, engywuck-extras, engywuck-backports, engywuck-backports-extras"
- db_subst ${PROJECT}/archives DEFAULT ""
db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, non-free, restricted"
- db_subst ${PROJECT}/archive-areas DEFAULT "main"
Run_debconf
;;
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index ceb563d..c5891f4 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -148,7 +148,7 @@ case "${1}" in
esac
# apt
- if [ -n "${ARCHIVES}" ] && [ "${ARCHIVES}" != "false" ]
+ if [ -n "${ARCHIVES}" ]
then
Install_apt_sources
Install_apt_preferences
diff --git a/debian/progress-linux.templates b/debian/progress-linux.templates
index 19eada0..0972dc6 100644
--- a/debian/progress-linux.templates
+++ b/debian/progress-linux.templates
@@ -6,13 +6,13 @@ Template: progress-linux/archives
Type: multiselect
Choices: ${CHOICES}
Choices-C: ${CHOICES_C}
-Default: ${DEFAULT}
+Default:
_Description: setup apt archives:
Please select the apt archives to setup.
Template: progress-linux/archive-areas
Type: multiselect
Choices: ${CHOICES}
-Default: ${DEFAULT}
+Default:
_Description: setup apt archive areas:
Please select the apt archive areas to setup.