maint: support test releases numbered from .90 for announcements.

* maintainer/maint.mk (beta_version_rx, alpha_version_rx):
update to use MAJOR.MINOR.90, .92, ..., for "beta" (test) releases,
and .91, .93, ... for "alpha" (development). Follows the
2024-01-21 change.
* HACKING: typo en passant.

diff --git a/HACKING b/HACKING
index 8ec3fb0dd7136da2ac4255be1b6fc9897684a3df..f70fcea8a8e6b1bc5b8739383ca412524d4936d4 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -592,7 +592,7 @@
   testing on exotic or proprietary systems.  Finally, copy an abridged
   version of the announcement into the NEWS feed at:
   <https://savannah.gnu.org/projects/automake>.
-  Be sure to link a  version to the complete announcement (from
+  Be sure to link a version to the complete announcement (from
   the version you sent to the automake list, as get archived on
   <https://lists.gnu.org/archive/html/automake/>).
 

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index a995de58ef92149aa256d1123a3bfd3ceba58b39..e10f9fd2a3c9f2612e1a228990a96859772f8a5f 100644 (file)
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -111,14 +111,23 @@ EXTRA_DIST += lib/gnupload
 
 # First component of a version number (mandatory).
 rx-0 = ^[1-9][0-9]*
-# Later components of a version number (optional).
-rx-1 = \.[0-9][0-9]*
+#
+# Minor component of a version number (omitted only for a major
+# release): .1, .10, etc. Assume we won't go beyond .99.
+rx-1 = \.[0-9]{1,2}
+#
+# Micro component of a version number (optional):
+# Either a single digit 0-9, or multiple digits starting with 0-8.
+# Multiple digits starting with 9 (.90, etc.) are for test releases.
+rx-2 = \.([0-9]|[0-8][0-9]+)
+#
 # Used in recipes to decide which kind of release we are.
 stable_major_version_rx = $(rx-0)\.0$$
 stable_minor_version_rx = $(rx-0)$(rx-1)$$
-stable_micro_version_rx = $(rx-0)$(rx-1)$(rx-1)$$
-beta_version_rx = $(rx-0)($(rx-1)){1,2}[bdfhjlnprtvxz]$$
-alpha_version_rx  = $(rx-0)($(rx-1)){1,2}[acegikmoqsuwy]$$
+stable_micro_version_rx = $(rx-0)$(rx-1)$(rx-2)$$
+# The 9* is for pretests beyond the first five, e.g., .990, .992, ...
+beta_version_rx = $(rx-0)$(rx-1)\.99*[02468]$$
+alpha_version_rx  = $(rx-0)$(rx-1)\.99*[13579]$$
 match_version = echo "$(VERSION)" | $(EGREP) >/dev/null
 
 # Check that we don't have uncommitted or unstaged changes.