Add more archive keys: Geogebra, Grandorgue and DebMultimedia.

13 files changed, 50 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index e569002..32239e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-all: arctica-keys itzks-keys x2go-keys  the-rest
+all: arctica-keys itzks-keys x2go-keys debmultimedia-keys geogebra-keys grandorgue-keys the-rest
 
-arctica-keys: output/keyrings/arctica-keyring.gpg
-
-itzks-keys: output/keyrings/itzks-keyring.gpg
-
-x2go-keys: output/keyrings/x2go-keyring.gpg
+arctica-keys:       output/keyrings/arctica-keyring.gpg
+itzks-keys:         output/keyrings/itzks-keyring.gpg
+x2go-keys:          output/keyrings/x2go-keyring.gpg
+debmultimedia-keys: output/keyrings/debmultimedia-keyring.gpg
+geogebra-keys:      output/keyrings/geogebra-keyring.gpg
+grandorgue-keys:    output/keyrings/grandorgue-keyring.gpg
 
 the-rest: output/sha512sums.txt output/README output/changelog
 
@@ -26,10 +27,28 @@ output/keyrings/x2go-keyring.gpg: x2go-keyring-gpg/0x*
 	mkdir -p output/keyrings/
 	cat x2go-keyring-gpg/0x* > output/keyrings/x2go-keyring.gpg
 
+### Deb Mutlimedia
+
+output/keyrings/debmultimedia-keyring.gpg: debmultimedia-keyring-gpg/0x*
+	mkdir -p output/keyrings/
+	cat debmultimedia-keyring-gpg/0x* > output/keyrings/debmultimedia-keyring.gpg
+
+### Geogebra
+
+output/keyrings/geogebra-keyring.gpg: geogebra-keyring-gpg/0x*
+	mkdir -p output/keyrings/
+	cat geogebra-keyring-gpg/0x* > output/keyrings/geogebra-keyring.gpg
+
+### Grandorgue
+
+output/keyrings/grandorgue-keyring.gpg: grandorgue-keyring-gpg/0x*
+	mkdir -p output/keyrings/
+	cat grandorgue-keyring-gpg/0x* > output/keyrings/grandorgue-keyring.gpg
+
 
 ### The Rest!!!
 
-output/sha512sums.txt: arctica-keys itzks-keys x2go-keys
+output/sha512sums.txt: arctica-keys itzks-keys x2go-keys debmultimedia-keys geogebra-keys grandorgue-keys
 	cd output; sha512sum keyrings/* > sha512sums.txt
 
 output/README: README
diff --git a/README b/README
index b50352d..eac994c 100644
--- a/README
+++ b/README
@@ -17,4 +17,4 @@ For further information on keyrings refer to the Debian package
 ,,debian-keyring''.
 
 Best regards,
-Mike Gabriel, DAS-NETZWERKTEAM, 2018-01-27
+Mike Gabriel, DAS-NETZWERKTEAM, 2018-01-29
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
 
diff --git a/debmultimedia-keyring-gpg/0x5C808C2B65558117 b/debmultimedia-keyring-gpg/0x5C808C2B65558117
new file mode 100644
index 0000000..ce87cf2
--- /dev/null
+++ b/debmultimedia-keyring-gpg/0x5C808C2B65558117
diff --git a/geogebra-keyring-gpg/0xC072A32983A736CF b/geogebra-keyring-gpg/0xC072A32983A736CF
new file mode 100644
index 0000000..f1f4cf0
--- /dev/null
+++ b/geogebra-keyring-gpg/0xC072A32983A736CF
diff --git a/grandorgue-keyring-gpg/0x3536C1B64FC39E69 b/grandorgue-keyring-gpg/0x3536C1B64FC39E69
new file mode 100644
index 0000000..803a8ac
--- /dev/null
+++ b/grandorgue-keyring-gpg/0x3536C1B64FC39E69
diff --git a/keyids b/keyids
new file mode 100644
index 0000000..22f39d5
--- /dev/null
+++ b/keyids
@@ -0,0 +1,6 @@
+0xA8680F5598DE3101 ArcticaProject PkgMaster <pkgmaster@arctica-project.org>
+0xCBBFF2FC3F8F5540 Debian/Ubuntu Packaging <debian@it-zukunft-schule.de>
+0xE1F958385BFE2B6E X2go Debian/Ubuntu Packaging <debian@x2go.org>
+0x5C808C2B65558117 Christian Marillat <marillat@deb-multimedia.org>
+0xC072A32983A736CF International GeoGebra Institute <office@geogebra.org>
+0x3536C1B64FC39E69 home:e9925248 OBS Project <home:e9925248@build.opensuse.org>
diff --git a/keyids.arctica b/keyids.arctica
deleted file mode 100644
index 80c2dd7..0000000
--- a/keyids.arctica
+++ /dev/null
@@ -1 +0,0 @@
-0xA8680F5598DE3101 ArcticaProject PkgMaster <pkgmaster@arctica-project.org>
diff --git a/keyids.itzks b/keyids.itzks
deleted file mode 100644
index 4b98918..0000000
--- a/keyids.itzks
+++ /dev/null
@@ -1 +0,0 @@
-0xCBBFF2FC3F8F5540 Debian/Ubuntu Packaging <debian@it-zukunft-schule.de>
diff --git a/keyids.x2go b/keyids.x2go
deleted file mode 100644
index 915970f..0000000
--- a/keyids.x2go
+++ /dev/null
@@ -1 +0,0 @@
-0xE1F958385BFE2B6E X2go Debian/Ubuntu Packaging <debian@x2go.org>
diff --git a/t/keyids-complete.t b/t/keyids-complete.t
index 58c0f81..8b0de88 100755
--- a/t/keyids-complete.t
+++ b/t/keyids-complete.t
@@ -1,37 +1,15 @@
 #!/bin/sh
-# Makes sure every key in arctica-*-gpg has an entry in the
+# Makes sure every key in *-keyring-gpg has an entry in the
 # keyids mapping file.
 set -e
 
 fail=0
 
-for keyring in arctica-keyring-gpg; do
+for keyring in arctica-keyring-gpg itzks-keyring-gpg x2go-keyring-gpg debmultimedia-keyring-gpg geogebra-keyring-gpg grandorgue-keyring-gpg; do
 	cd $keyring
 	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.arctica; then
-			echo "$keyring: $key is not in keyids.arctica file."
-			fail=1
-		fi
-	done
-	cd ..
-done
-
-for keyring in itzks-keyring-gpg; do
-	cd $keyring
-	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.itzks; then
-			echo "$keyring: $key is not in keyids.itzks file."
-			fail=1
-		fi
-	done
-	cd ..
-done
-
-for keyring in x2go-keyring-gpg; do
-	cd $keyring
-	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.x2go; then
-			echo "$keyring: $key is not in keyids.x2go file."
+		if ! grep -q "^$key " ../keyids; then
+			echo "$keyring: $key is not in keyids file."
 			fail=1
 		fi
 	done
diff --git a/t/no-expired.t b/t/no-expired.t
index 5af0e1c..2d64129 100755
--- a/t/no-expired.t
+++ b/t/no-expired.t
@@ -12,7 +12,7 @@ find_expired () {
 }
 
 fail=0
-for keyring in arctica-keyring.gpg itzks-keyring.gpg x2go-keyring.gpg; do
+for keyring in arctica-keyring.gpg itzks-keyring.gpg x2go-keyring.gpg debmultimedia-keyring.gpg geogebra-keyring.gpg grandorgue-keyring.gpg; do
 	find_expired $keyring
 done