summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile3
-rwxr-xr-xshare/build-scripts/debconf6
-rw-r--r--share/other/deb.progress-linux.org.gpgbin0 -> 2310 bytes
3 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index caae1e1..72c5964 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,9 @@ install: build
cp -r VERSION.txt $(DESTDIR)/usr/share/$(SOFTWARE)
cp -r share/config share/hooks share/keys share/build-scripts share/get-scripts $(DESTDIR)/usr/share/$(SOFTWARE)
+ # temporary sideloading new keys until keyring package in debian-stable has been updated
+ cp -r share/other $(DESTDIR)/usr/share/$(SOFTWARE)
+
mkdir -p $(DESTDIR)/usr/share/bash-completion/completions
cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions
diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index 2dd8cb7..9e28216 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -509,6 +509,12 @@ EOF
case "${MODE}" in
progress-linux)
+ # temporary sideloading new keys until keyring package in debian-stable has been updated
+ if [ -e "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg" ]
+ then
+ cp -f /usr/share/compute-tools/other/deb.progress-linux.org.gpg "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg"
+ fi
+
cat > "${DIRECTORY}/progress-linux.cfg" << EOF
progress-linux progress-linux/archives multiselect $(echo ${ARCHIVES} | sed -e 's| |, |g')
progress-linux progress-linux/archive-areas multiselect $(echo ${ARCHIVE_AREAS} | sed -e 's|,| |g')
diff --git a/share/other/deb.progress-linux.org.gpg b/share/other/deb.progress-linux.org.gpg
new file mode 100644
index 0000000..ed2bd81
--- /dev/null
+++ b/share/other/deb.progress-linux.org.gpg
Binary files differ