Bug: jessies apt needs her keys inside /etc/apt/trusted.gpg.djessie

This branch won't be relevant anymore after dropping jessie support.

- Fixes #8862

2 files changed, 4 insertions, 9 deletions

diff --git a/debian/install b/debian/install
index 334c73b..e577cfc 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-keyrings/*.gpg usr/share/keyrings
+keyrings/*.gpg etc/apt/trusted.gpg.d
diff --git a/debian/preinst b/debian/preinst
index 6ea7df1..7d097bc 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -19,13 +19,8 @@ if [ -e /etc/apt/trusted.gpg ] && which gpg >/dev/null; then
    gpg --batch --no-tty --no-default-keyring --keyring /etc/apt/trusted.gpg --delete-key 0xCE433F407BAB443AFEA196C1837C1AD5367429D9 2>/dev/null || true
 fi
 
-# Remove the leap keyrings from apt-key, they are being placed in
-# /usr/share/keyrings and /etc/apt/sources.list.d/leap.list is being generated
-# to have signed-by lines such as:
-#
-#deb [signed-by /usr/share/keyrings/leap-experimental-archive.gpg] http://deb.leap.se/platform snapshots main
-
-apt-key del 1E453B2CE87BEE2F7DFE99661E34A1828E207901 || true
-apt-key del CE433F407BAB443AFEA196C1837C1AD5367429D9 || true
+# For jessie we still need to put the apt keys into /etc/apt/trusted.gpg.d/ and use the fingerprint instead of the filepath
+# https://wiki.debian.org/DebianRepository/UseThirdParty#Jessie_configurations
+#deb [signed-by=1E453B2CE87BEE2F7DFE99661E34A1828E207901] http://deb.leap.se/platform jessie master
 
 #DEBHELPER#