DEB trinity-keyring: Add a second key for the trinity archive.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit edaf738a10c2a1d56074151c3b0c97ad12ffe2f6)

4 files changed, 120 insertions, 8 deletions

diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg
new file mode 100644
index 000000000..228bbb7a9
--- /dev/null
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg
@@ -0,0 +1,75 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+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
+5AoiHUlDz3QLNfE04n6LGyft
+=UPdj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
index 4498a51e8..910f1a562 100644
--- a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
@@ -2,10 +2,21 @@
 Hash: SHA512
 
 7d31c6d96998f2cf978c8b641a72c1d8  keyrings/trinity-keyring.gpg
+be87deb46e4e576e63e8ca2603b99bb1  keyrings/trinity-archive-keyring.gpg
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.12 (GNU/Linux)
 
-iFYEAREKAAYFAlOU3l0ACgkQLaxZSoRZrGEK8gDfb8NcvOCmRG1vlISV5Wnqdehb
-+ZL9t4tbCl9vwQDgv8OYHWXQHigPDgR5N6n/9Eymy8aurntPF90BYQ==
-=kKmH
+iQIcBAEBCgAGBQJcu1TdAAoJEGCPUpOgS+ZoYWsP/2oVdV6IItB93c8c4rkb7nxy
+Nse1jA8LebXUsdVG2YqUWABoUjIkJ61Trr3IDUnhoWQQscgQOBx/liNkKqPvkLHt
+0EKpwDA305kTlzfS8c3NnOkYTs6oX0RQkdYMeNdCcuGeUJcia0DlUlWnghARaMO8
+fk+ph0dsq+G+uhXGhJPj5+mPzYCOhn6372OlG1s0dfG9F4Bgc8eDgrk9GBbsnafj
+sV7NOj4l4S0+DLRbmmVuTAoFLg7QNShwWw/sNX384MOZgZhk3idDYAqz+42sYYmN
+AXqbh7fjGTLEm+kjahekeEMRbvydvSTFgKvAAodxKAjZmhr4tNmaC+Ejq1+02Bev
+Kjd0r+t4z3dTqrnlQR8HM0kw8u5/+Yh71x+TW47PlaCtO5E3JLsQmp5wk3jGQuaZ
+cwiO/MAeqyXOINLZL4tgNdtG1Af91MGm7bK9mojCg+efBL9l/VoV6SZrAD0Rmr0y
+Ja4nOExAmRgGF60kil37E6FhK0P4ZYQoIRDVrO1Vu4GhXwUiOzqok6SJyXurH43p
+Yc1Jp2bgF5+u4jBRB8IWWpVzgHV+u68HMRa5GrHmr8yFPb7Q5BmRie0lSGkBvUXB
+33wObwSFAwo5twkY3HezLBg7UOY4ZYlg7UETOeDETg5buLEY1CD1XoiB9hLNDwvs
+jg00u1gDSJDIWIM/MYEw
+=l1P0
 -----END PGP SIGNATURE-----
diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt
new file mode 100644
index 000000000..5a82cecde
--- /dev/null
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+b9fe7db453460e42b62f7e06ce87f24d63ae092bbf7858a50f40851b59c37dc5884c93b4faef0d81f7dfc0b77f6195b71890f2bc5e5157657d596c0f818c9c23  keyrings/trinity-keyring.gpg
+2873f610356103f471ae1eb0e86ded1f7d5f5a331cba0b37403f85658228422d2566e0706a2e960154ded704d8db68e80604999af12567b90391e9df6f9d12b9  keyrings/trinity-archive-keyring.gpg
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAEBCgAGBQJcu1VWAAoJEGCPUpOgS+ZoceEQAJfUdhFZ/QRlg3jHpxluTR/A
+NZKMkchOnXl5WAT/sswrNCf3gdKA4ViTnJyLToNjs/LxqemJcxaRCaTb1opJgzVg
+IedkZqIyMjocG3dwGK5GNTjQSPNRfsbU+NNx1bXkqTYR2tfpobaaaZm2TEAncm6k
+KNWv6enm+eUfQFMpkNgqDyX//esV7O6b4vZKADkntOvYs8PJk2CHnLDx4pOQc+4U
+hFaFXQhWeweHyCvPeINBCkbd1eWeJ6nYzSHZ4Eawh8q8dpSiYlbOCyYrAsQtjgx8
+YKySHDGV7qkngtuu9UFqLn3i1W/W+tB3UG2/VZxZhgjuTzKRf5Pb0yV/yHjSUMEI
+2DT+/mg/JfzuBNCE6CyE3GNL+f8qZnriK9X8Jv1j+kc1184CfUFt3u3g8b6ygvW6
+/lek64DW7rZ7yZwmWC1KYUTWPWlcChd3rVqUtTg5nciJ5S5NhFeEUTpgpG/5BR+H
+YeOUbfviIxF7cbGsYl8ZUXdvTnEiyssj6dJrL8bjoND0R+wXDGS5s24t7a9K4Svc
+xh9oI6Vhbu4H37X0KgRtEfN0v7BnGC/5S5PLlJNjlT8d8A5igv1BbVI3AzbYBP6B
+Y/ztq7giCwVRz3oYB4IWCyo1gvwItssA+UeD23HvG0wU0PgzZCvKpXK21AvdyJNl
+jC9qFHi/FO58UWXmLZC6
+=q/J5
+-----END PGP SIGNATURE-----
diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/rules b/ubuntu/_base/metapackages/trinity-keyring/debian/rules
index e2df3ba49..45de64142 100755
--- a/ubuntu/_base/metapackages/trinity-keyring/debian/rules
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/rules
@@ -27,7 +27,11 @@ clean::
 binary-install/trinity-keyring::
 	dh_testdir
 	mkdir -p debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d
-	gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg \
-	    --dearmor keyrings/$(cdbs_curpkg).gpg
-	touch -r keyrings/$(cdbs_curpkg).gpg \
-	    debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg
+	gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-keyring.gpg \
+	    --dearmor keyrings/trinity-keyring.gpg
+	touch -r keyrings/trinity-keyring.gpg \
+	    debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-keyring.gpg
+	gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-archive-keyring.gpg \
+	    --dearmor keyrings/trinity-archive-keyring.gpg
+	touch -r keyrings/trinity-archive-keyring.gpg \
+	    debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-archive-keyring.gpg