summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-01-29 18:19:30 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-01-29 18:19:30 +0000
commita478fce7fd130425da12219bf43ec61ba9f52bf0 (patch)
tree46ebd4d80ce492c492869fff077f0dc9e202c2e8
parentAdding debian version 20181201-1. (diff)
downloadprogress-linux-a478fce7fd130425da12219bf43ec61ba9f52bf0.tar.xz
progress-linux-a478fce7fd130425da12219bf43ec61ba9f52bf0.zip
Adding support for restricted archive area.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/po/templates.pot4
-rwxr-xr-xdebian/progress-linux.postinst12
-rw-r--r--debian/progress-linux.templates2
3 files changed, 14 insertions, 4 deletions
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 543820a..8dd1c16 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: progress-linux\n"
"Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-01-29 07:38+0100\n"
+"POT-Creation-Date: 2019-01-29 19:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr ""
#. Type: multiselect
#. Choices
#: ../progress-linux.templates:3001
-msgid "main, contrib, non-free"
+msgid "main, contrib, non-free, restricted"
msgstr ""
#. Type: multiselect
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index 70414bd..c6be2f4 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -43,9 +43,19 @@ Configure ()
{
ARCHIVE="${1}"
+ case "${ARCHIVE}" in
+ *-extras)
+ AREAS="${ARCHIVE_AREAS}"
+ ;;
+
+ *)
+ AREAS="$(echo ${ARCHIVE_AREAS} | sed -e 's| restricted||')"
+ ;;
+ esac
+
# apt sources
cat >> /etc/apt/sources.list.d/progress-linux.list << EOF
-deb https://deb.progress-linux.org/packages ${ARCHIVE} ${ARCHIVE_AREAS}
+deb https://deb.progress-linux.org/packages ${ARCHIVE} ${AREAS}
EOF
# apt preferences
diff --git a/debian/progress-linux.templates b/debian/progress-linux.templates
index eb842bd..d1bf165 100644
--- a/debian/progress-linux.templates
+++ b/debian/progress-linux.templates
@@ -12,7 +12,7 @@ _Description: setup archives:
Template: progress-linux/archive-areas
Type: multiselect
-_Choices: main, contrib, non-free
+_Choices: main, contrib, non-free, restricted
Default: main
_Description: setup archive areas:
Please select the archive areas to setup.