add mailing list & bug reporting info

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

3 files changed, 54 insertions, 14 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 32cf2b6..8a84fd0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,11 +3,4 @@ Thank you for your interest in contributing to this project!
 Please **do not** submit a pull request on GitHub.  This repository is
 an automated mirror, and I don't develop using GitHub's platform.
 
-Instead, either
-
-- publish a branch somewhere (a GitHub fork is fine), and e-mail
-  <spwhitton@spwhitton.name> asking me to merge your branch, possibly
-  using git-request-pull(1)
-
-- prepare patches with git-format-patch(1), and send them to
-  <spwhitton@spwhitton.name>, possibly using git-send-email(1)
+Instead, please see CONTRIBUTING.md for patch submission info.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 428fce0..8e5d94e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -7,14 +7,50 @@ Please **do not** submit a pull request on GitHub.  The repository
 there is an automated mirror, and I don't develop using GitHub's
 platform.
 
-Instead, either
+Project mailing lists
+=====================
 
-- publish a branch somewhere (a GitHub fork is fine), and e-mail
-  <spwhitton@spwhitton.name> asking me to merge your branch, possibly
-  using git-request-pull(1)
+There are two low-volume project mailing lists, shared with some other
+small free software projects:
 
-- prepare patches with git-format-patch(1), and send them to
-  <spwhitton@spwhitton.name>, possibly using git-send-email(1)
+- sgo-software-announce --
+  <https://www.chiark.greenend.org.uk/mailman/listinfo/sgo-software-announce>
+
+  For release announcements.
+
+- sgo-software-discuss --
+  <https://www.chiark.greenend.org.uk/mailman/listinfo/sgo-software-discuss>
+
+  For bug reports, posting patches, user questions and discussion.
+
+Please prepend ``[git-remote-gcrypt]`` to the subject line of your e-mail,
+and for patches, pass ``--subject-prefix="PATCH git-remote-gcrypt"`` to
+git-send-email(1).
+
+Posting to sgo-software-discuss
+-------------------------------
+
+If you're not subscribed to the list, your posting will be held for
+moderation; please be patient.
+
+Whether or not you're subscribed, chiark.greenend.org.uk has
+aggressive antispam.  If your messages aren't getting through, we can
+easily add a bypass on chiark; please contact <spwhitton@spwhitton.name>.
+
+If you don't want to deal with the mailing list and just want to send
+patches, you should feel free to pass ``--to=spwhitton@spwhitton.name``
+to git-send-email(1).
+
+Alternatively, publish a git branch somewhere publically accessible (a
+GitHub fork is fine) and write to me asking me to merge it.  I may
+convert your branch back into patches when sending you feedback :)
+
+Reporting bugs
+==============
+
+Please read "How to Report Bugs Effectively" to ensure your bug report
+constitutes a useful contribution to the project:
+<https://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
 
 Signing off your commits
 ========================
diff --git a/debian/changelog b/debian/changelog
index ee1403c..ba35f3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+git-remote-gcrypt (1.4-1) UNRELEASED; urgency=medium
+
+  Upstream:
+  * CONTRIBUTING.md:
+    - Add mailing list information.
+    - Add link to "How to Report Bugs Effectively".
+  * PULL_REQUEST_TEMPLATE.md: replace patch submission instructions with
+    reference to CONTRIBUTING.md.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 01 May 2020 12:06:49 -0700
+
 git-remote-gcrypt (1.3-1) unstable; urgency=medium
 
   Upstream: