[X2Go-Commits] [x2go-keyring] 01/02: README.maintainer: update documentation.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit 943c7ce1e43e36fe46f007b0050f3e52fd4b8d68
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 17 12:17:26 2019 +0200

    README.maintainer: update documentation.
    
    We want to update the keyrings before signing them and also reference
    the maintainers keyring which DOES get installed in our package.
---
 README.maintainer | 11 +++++++++--
 debian/changelog  |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.maintainer b/README.maintainer
index 999838a..6bf765d 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -27,9 +27,10 @@ Note that the filenames used for the changeset filenames must never be
 subsets of another changeset filename, or the keyring build will
 over-eagerly remove them and then fail.
 
-Removing an archive key
------------------------
+Removing an archive or maintainer key
+-------------------------------------
 
+[For maintainers, just replace "archive" with "maintainers"!]
 [There should be a better way of doing this]
 
 Copy the corresponding entry from active-keys/index to removed-keys/index
@@ -55,7 +56,13 @@ rm_conffile /etc/apt/trusted.gpg.d/x2go-archive-${foo}.gpg ${version}~~
 Pre-build
 ---------
 
+make keyrings/x2go-archive-keyring.gpg
+make keyrings/x2go-maintainers-keyring.gpg
 gpg --armor --detach-sign keyrings/x2go-archive-keyring.gpg
+gpg --armor --detach-sign keyrings/x2go-maintainers-keyring.gpg
 
 If any keys were removed:
+make keyrings/x2go-archive-removed-keys.gpg
+make keyrings/x2go-maintainers-removed-keys.gpg
 gpg --armor --detach-sign keyrings/x2go-archive-removed-keys.gpg
+gpg --armor --detach-sign keyrings/x2go-maintainers-removed-keys.gpg
diff --git a/debian/changelog b/debian/changelog
index c4c1beb..ad4828f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,9 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
     good enough on older system like Jessie.
   * keyrings/x2go-archive-keyring.gpg.asc: refresh signature after actually
     inserting the correct key.
+  * README.maintainer: update documentation. We want to update the keyrings
+    before signing them and also reference the maintainers keyring which DOES
+    get installed in our package.
   * debian/control:
     - Change maintainer to the mailing list.
     - Add the old package maintainer to the Uploaders field and myself.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git