From be632a0506b5d413b02b7e05ff83bdfaf7b8c58e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 15 Jun 2018 18:38:19 -0300
Subject: Use keyring.debian.org::keyrings instead of a submodule

---
 .gitignore  | 1 +
 .gitmodules | 5 -----
 Makefile    | 6 ++++++
 keyring     | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 keyring

diff --git a/.gitignore b/.gitignore
index 962f7eb..3c24c59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tmp
 /www
 build-area
 puppet/modules
+keyrings
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 7fb7a92..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,5 +0,0 @@
-[submodule "keyring"]
-	path = keyring
-  #url = git://anonscm.debian.org/keyring/keyring.git
-  url = https://salsa.debian.org/debian-keyring/keyring.git
-  ignore = dirty
diff --git a/Makefile b/Makefile
index 1211f93..8da8402 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,16 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
+.PHONY: keyring
+
 web:
 	@ikiwiki --setup ikiwiki.setup
 
 web_deploy:
 	@rsync -avz --delete --exclude=keyring www/ debian:/var/sites/debian/www/
 
+keyring:
+	@rsync -az --progress keyring.debian.org::keyrings/ keyrings/
+	@gpg --verify keyrings/sha512sums.txt
+
 publish: web web_deploy
diff --git a/keyring b/keyring
deleted file mode 160000
index def80e6..0000000
--- a/keyring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit def80e60760843b7afe223c52e15503551a50dd7
-- 
cgit v1.2.3