From faf4c837fba119437ddbb36d6a799dc5fd79db37 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 13 Apr 2016 12:34:32 +0200 Subject: [PATCH] [gitian] Move keys to contrib/gitian-keys --- contrib/README.md | 6 +++--- .../achow101-key.pgp | 0 .../aschildbach-key.pgp | Bin .../bluematt-key.pgp | Bin .../btcdrak-key.pgp | 0 .../cdecker-key.pgp | Bin .../centaur1-key.pgp | 0 .../cfields-key.pgp | 0 .../devrandom-key.pgp | Bin .../{gitian-downloader => gitian-keys}/erkmos.pgp | Bin .../fanquake-key.pgp | 0 .../gavinandresen-key.pgp | Bin .../jl2012-key.pgp | 0 .../jonasschnelli-key.pgp | 0 .../laanwj-key.pgp | 0 .../luke-jr-key.pgp | Bin .../marcofalke-key.pgp | 0 .../michagogo-key.pgp | 0 .../petertodd-key.pgp | 0 .../{gitian-downloader => gitian-keys}/prab-key.pgp | 0 .../{gitian-downloader => gitian-keys}/sipa-key.pgp | Bin .../tcatm-key.pgp | Bin .../wtogami-key.pgp | 0 doc/release-process.md | 2 +- 24 files changed, 4 insertions(+), 4 deletions(-) rename contrib/{gitian-downloader => gitian-keys}/achow101-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/aschildbach-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/bluematt-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/btcdrak-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/cdecker-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/centaur1-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/cfields-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/devrandom-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/erkmos.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/fanquake-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/gavinandresen-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/jl2012-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/jonasschnelli-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/laanwj-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/luke-jr-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/marcofalke-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/michagogo-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/petertodd-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/prab-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/sipa-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/tcatm-key.pgp (100%) rename contrib/{gitian-downloader => gitian-keys}/wtogami-key.pgp (100%) diff --git a/contrib/README.md b/contrib/README.md index 946153916..32b3a170a 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -34,10 +34,10 @@ Contains files used to package bitcoind/bitcoin-qt for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### -Gavin's notes on getting gitian builds up and running using KVM. +Notes on getting Gitian builds up and running using KVM. -### [Gitian-downloader](/contrib/gitian-downloader) -Various PGP files of core developers. +### [Gitian-keys](/contrib/gitian-keys) +PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. diff --git a/contrib/gitian-downloader/achow101-key.pgp b/contrib/gitian-keys/achow101-key.pgp similarity index 100% rename from contrib/gitian-downloader/achow101-key.pgp rename to contrib/gitian-keys/achow101-key.pgp diff --git a/contrib/gitian-downloader/aschildbach-key.pgp b/contrib/gitian-keys/aschildbach-key.pgp similarity index 100% rename from contrib/gitian-downloader/aschildbach-key.pgp rename to contrib/gitian-keys/aschildbach-key.pgp diff --git a/contrib/gitian-downloader/bluematt-key.pgp b/contrib/gitian-keys/bluematt-key.pgp similarity index 100% rename from contrib/gitian-downloader/bluematt-key.pgp rename to contrib/gitian-keys/bluematt-key.pgp diff --git a/contrib/gitian-downloader/btcdrak-key.pgp b/contrib/gitian-keys/btcdrak-key.pgp similarity index 100% rename from contrib/gitian-downloader/btcdrak-key.pgp rename to contrib/gitian-keys/btcdrak-key.pgp diff --git a/contrib/gitian-downloader/cdecker-key.pgp b/contrib/gitian-keys/cdecker-key.pgp similarity index 100% rename from contrib/gitian-downloader/cdecker-key.pgp rename to contrib/gitian-keys/cdecker-key.pgp diff --git a/contrib/gitian-downloader/centaur1-key.pgp b/contrib/gitian-keys/centaur1-key.pgp similarity index 100% rename from contrib/gitian-downloader/centaur1-key.pgp rename to contrib/gitian-keys/centaur1-key.pgp diff --git a/contrib/gitian-downloader/cfields-key.pgp b/contrib/gitian-keys/cfields-key.pgp similarity index 100% rename from contrib/gitian-downloader/cfields-key.pgp rename to contrib/gitian-keys/cfields-key.pgp diff --git a/contrib/gitian-downloader/devrandom-key.pgp b/contrib/gitian-keys/devrandom-key.pgp similarity index 100% rename from contrib/gitian-downloader/devrandom-key.pgp rename to contrib/gitian-keys/devrandom-key.pgp diff --git a/contrib/gitian-downloader/erkmos.pgp b/contrib/gitian-keys/erkmos.pgp similarity index 100% rename from contrib/gitian-downloader/erkmos.pgp rename to contrib/gitian-keys/erkmos.pgp diff --git a/contrib/gitian-downloader/fanquake-key.pgp b/contrib/gitian-keys/fanquake-key.pgp similarity index 100% rename from contrib/gitian-downloader/fanquake-key.pgp rename to contrib/gitian-keys/fanquake-key.pgp diff --git a/contrib/gitian-downloader/gavinandresen-key.pgp b/contrib/gitian-keys/gavinandresen-key.pgp similarity index 100% rename from contrib/gitian-downloader/gavinandresen-key.pgp rename to contrib/gitian-keys/gavinandresen-key.pgp diff --git a/contrib/gitian-downloader/jl2012-key.pgp b/contrib/gitian-keys/jl2012-key.pgp similarity index 100% rename from contrib/gitian-downloader/jl2012-key.pgp rename to contrib/gitian-keys/jl2012-key.pgp diff --git a/contrib/gitian-downloader/jonasschnelli-key.pgp b/contrib/gitian-keys/jonasschnelli-key.pgp similarity index 100% rename from contrib/gitian-downloader/jonasschnelli-key.pgp rename to contrib/gitian-keys/jonasschnelli-key.pgp diff --git a/contrib/gitian-downloader/laanwj-key.pgp b/contrib/gitian-keys/laanwj-key.pgp similarity index 100% rename from contrib/gitian-downloader/laanwj-key.pgp rename to contrib/gitian-keys/laanwj-key.pgp diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-keys/luke-jr-key.pgp similarity index 100% rename from contrib/gitian-downloader/luke-jr-key.pgp rename to contrib/gitian-keys/luke-jr-key.pgp diff --git a/contrib/gitian-downloader/marcofalke-key.pgp b/contrib/gitian-keys/marcofalke-key.pgp similarity index 100% rename from contrib/gitian-downloader/marcofalke-key.pgp rename to contrib/gitian-keys/marcofalke-key.pgp diff --git a/contrib/gitian-downloader/michagogo-key.pgp b/contrib/gitian-keys/michagogo-key.pgp similarity index 100% rename from contrib/gitian-downloader/michagogo-key.pgp rename to contrib/gitian-keys/michagogo-key.pgp diff --git a/contrib/gitian-downloader/petertodd-key.pgp b/contrib/gitian-keys/petertodd-key.pgp similarity index 100% rename from contrib/gitian-downloader/petertodd-key.pgp rename to contrib/gitian-keys/petertodd-key.pgp diff --git a/contrib/gitian-downloader/prab-key.pgp b/contrib/gitian-keys/prab-key.pgp similarity index 100% rename from contrib/gitian-downloader/prab-key.pgp rename to contrib/gitian-keys/prab-key.pgp diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-keys/sipa-key.pgp similarity index 100% rename from contrib/gitian-downloader/sipa-key.pgp rename to contrib/gitian-keys/sipa-key.pgp diff --git a/contrib/gitian-downloader/tcatm-key.pgp b/contrib/gitian-keys/tcatm-key.pgp similarity index 100% rename from contrib/gitian-downloader/tcatm-key.pgp rename to contrib/gitian-keys/tcatm-key.pgp diff --git a/contrib/gitian-downloader/wtogami-key.pgp b/contrib/gitian-keys/wtogami-key.pgp similarity index 100% rename from contrib/gitian-downloader/wtogami-key.pgp rename to contrib/gitian-keys/wtogami-key.pgp diff --git a/doc/release-process.md b/doc/release-process.md index 2c83896c2..5a6ac8482 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -115,7 +115,7 @@ The gbuild invocations below DO NOT DO THIS by default. Add other gitian builders keys to your gpg keyring - gpg --import ../bitcoin/contrib/gitian-downloader/*.pgp + gpg --import ../bitcoin/contrib/gitian-keys/*.pgp Verify the signatures