From 2f0f33fbf9d0d5fb1bbafd0931b04380b5d1af81 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 7 Sep 2023 17:48:14 +0200 Subject: [PATCH] Update docs for (co-)maintainer changes * admin/MAINTAINERS: Add information on current maintainers as a canonical place to find this information. * doc/emacs/ack.texi (Acknowledgments): Update for recent Emacs (co-)maintainer changes. * admin/make-tarball.txt: Add note as a reminder to update the above before making a new release. --- admin/MAINTAINERS | 5 +++++ admin/make-tarball.txt | 20 ++++++++++++-------- doc/emacs/ack.texi | 11 +++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 6e080d1f5bb..98bbfa5bd7c 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -5,6 +5,11 @@ what parts of the Emacs distribution. The areas can be defined "arbitrarily", but should provide fairly well-defined boundaries so that there are not too many ambiguities. +The (co-)maintainers of Emacs are: + + Eli Zaretskii + Stefan Kangas + ============================================================================== 1. Areas that someone wants to be maintaining (i.e. has a particularly keen interest in). There's no need to list files where you are diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index fddf8444067..505d3469d3c 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -205,7 +205,11 @@ General steps (for each step, check for possible errors): you need to repeat from step 4 onwards. (You can commit the files from step 2 and 3 earlier to reduce the chance of this.) -6. ./make-dist --snapshot --no-compress +6. If there has been a change in who is the Emacs maintainer since + the last release, update doc/misc/ack.texi and admin/MAINTAINERS + to reflect this. You can commit this separately. + +7. ./make-dist --snapshot --no-compress Check the contents of the new tar with admin/diff-tar-files against the previous release (if this is the first pretest) or the @@ -234,7 +238,7 @@ General steps (for each step, check for possible errors): The output of this command might be easier to compare to the tarball than the one you get from find. -7. tar xf emacs-NEW.tar; cd emacs-NEW +8. tar xf emacs-NEW.tar; cd emacs-NEW ./configure --prefix=/tmp/emacs && make check && make install Use 'script' or M-x compile to save the compilation log in @@ -244,7 +248,7 @@ General steps (for each step, check for possible errors): M-x ediff. Especially check that Info files aren't built, and that no autotools (autoconf etc) run. -8. You can now tag the release/pretest and push it together with the +9. You can now tag the release/pretest and push it together with the last commit: cd EMACS_ROOT_DIR && git tag -a TAG -m "Emacs TAG" @@ -270,7 +274,7 @@ General steps (for each step, check for possible errors): git tag -a emacs-28.1-rc1 -m "Emacs 28.1 RC1" git tag -a emacs-28.1 -m "Emacs 28.1 release" -9. Decide what compression schemes to offer. +10. Decide what compression schemes to offer. For a release, at least gz and xz: gzip --best --no-name -c emacs-NEW.tar > emacs-NEW.tar.gz xz -c emacs-NEW.tar > emacs-NEW.tar.xz @@ -314,14 +318,14 @@ General steps (for each step, check for possible errors): For a pretest, place the files in /incoming/alpha instead, so that they appear on https://alpha.gnu.org/. -10. After five minutes, verify that the files are visible at +11. After five minutes, verify that the files are visible at https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or https://ftp.gnu.org/gnu/emacs/ for a release. Download them and check the signatures and SHA1/SHA256 checksums. Check they build (./configure --with-native-compilation). -11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org. +12. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org. For a pretest, also bcc: platform-testers@gnu.org. For a release, also bcc: info-gnu@gnu.org. (The reason for using bcc: is to make it less likely that people @@ -345,9 +349,9 @@ General steps (for each step, check for possible errors): (Use e.g. `M-x mml-secure-message-sign' in `message-mode' to sign an email.) -12. After a release, update the Emacs pages as described below. +13. After a release, update the Emacs pages as described below. -13. After a release, bump the Emacs version on the release branch. +14. After a release, bump the Emacs version on the release branch. There is no need to bump the version after a pretest; the version is bumped before the next pretest or release instead. diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index d61809fa58f..7d7f76b6645 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -525,7 +525,7 @@ browser to display a URL. @item Lars Magne Ingebrigtsen was the Emacs (co-)maintainer from Emacs 27.2 -onwards. He did a major redesign of the Gnus news-reader and wrote +to 29.1. He did a major redesign of the Gnus news-reader and wrote many of its parts. Several of these are now general components of Emacs, including: @file{dns.el} for Domain Name Service lookups; @file{format-spec.el} for formatting arbitrary format strings; @@ -590,6 +590,9 @@ control system. Tomoji Kagatani implemented @file{smtpmail.el}, used for sending out mail with SMTP. +@item +Stefan Kangas was the Emacs (co-)maintainer from 29.2 onwards. + @item Ivan Kanis wrote @file{vc-hg.el}, support for the Mercurial version control system. @@ -1379,9 +1382,9 @@ Rodney Whitby and Reto Zimmermann wrote @file{vhdl-mode.el}, a major mode for editing VHDL source code. @item -John Wiegley was the Emacs maintainer from Emacs 25 onwards. He wrote -@file{align.el}, a set of commands for aligning text according to -regular-expression based rules; @file{isearchb.el} for fast buffer +John Wiegley was the Emacs (co-)maintainer from Emacs 25 to 29.1. He +wrote @file{align.el}, a set of commands for aligning text according +to regular-expression based rules; @file{isearchb.el} for fast buffer switching; @file{timeclock.el}, a package for keeping track of time spent on projects; the Bahá'í calendar support; @file{pcomplete.el}, a programmable completion facility; @file{remember.el}, a mode for -- 2.39.2