aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/itzks-keyring.links6
-rw-r--r--debian/preinst9
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/itzks-keyring.links b/debian/itzks-keyring.links
index 190e76f..bab9899 100644
--- a/debian/itzks-keyring.links
+++ b/debian/itzks-keyring.links
@@ -1,3 +1,7 @@
usr/share/keyrings/arctica-keyring.gpg etc/apt/trusted.gpg.d/arctica-archive-keyring.gpg
usr/share/keyrings/itzks-keyring.gpg etc/apt/trusted.gpg.d/itzks-archive-keyring.gpg
-usr/share/keyrings/x2go-keyring.gpg etc/apt/trusted.gpg.d/x2go-archive-keyring.gpg \ No newline at end of file
+usr/share/keyrings/x2go-keyring.gpg etc/apt/trusted.gpg.d/x2go-archive-keyring.gpg
+usr/share/keyrings/debmultimedia-keyring.gpg etc/apt/trusted.gpg.d/debmultimedia-archive-keyring.gpg
+usr/share/keyrings/geogebra-keyring.gpg etc/apt/trusted.gpg.d/geogebra-archive-keyring.gpg
+usr/share/keyrings/grandorgue-keyring.gpg etc/apt/trusted.gpg.d/grandorgue-archive-keyring.gpg
+
diff --git a/debian/preinst b/debian/preinst
index fd8ab9d..7a7b135 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,8 +1,13 @@
#!/bin/sh -e
-if dpkg --compare-versions "$2" le "2018.01.27~"; then
+if dpkg --compare-versions "$2" le "2018.01.29~"; then
if which apt-key >/dev/null; then
- echo -n "Updating APT keyring - " && apt-key del 0xCBBFF2FC3F8F5540
+ # ITZkS key directly imported to main keyring
+ echo -n "Updating APT keyring - " && apt-key del 0xCBBFF2FC3F8F5540 || true
+ # manually imported Geogebra key
+ echo -n "Updating APT keyring - " && apt-key del 0xC072A32983A736CF || true
+ # manually imported Grandorgue key
+ echo -n "Updating APT keyring - " && apt-key del 0x3536C1B64FC39E69 || true
fi
fi