LP1940321: Remove apt-key from Makefile.debian

Bullseye is the end of the line for apt-key, but we don't need to wait
until it's gone to give it a send-off.

Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>

diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian
index 6edb42b..bc427ec 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian
+++ b/Open-ILS/src/extras/install/Makefile.debian
@@ -34,9 +34,9 @@ debian_sys_config:
 # Adding this for installing versions from PostgreSQL community apt source
 debian_postgresql_repo:
        if test -z "$$(grep -R apt.postgresql.org /etc/apt/)" ; then \
-               echo "deb http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \
+               echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.asc] http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \
                     > /etc/apt/sources.list.d/pgdg.list; \
-               wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - ; \
+               wget --quiet -O /etc/apt/trusted.gpg.d/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc ; \
                $(APT_TOOL) update ; \
        fi