From: Karl Berry Date: Thu, 26 Jun 2025 17:26:13 +0000 (-0700) Subject: maint: prepare for 1.18.1 release. X-Git-Tag: v1.18.1^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153298e27fa9414b25453440a2f36e1bb7bedfc1;p=thirdparty%2Fautomake.git maint: prepare for 1.18.1 release. * configure.ac (AC_INIT): 1.18.1. (APIVERSION remains 1.18.) * m4/amversion.m4: likewise (auto-updated). * HACKING: tweak release info some more. * NEWS: likewise. --- diff --git a/HACKING b/HACKING index 3d3532477..10328125b 100644 --- a/HACKING +++ b/HACKING @@ -532,6 +532,7 @@ * Ensure that the copyright notices of the distributed files are up to date. The maintainer-only target "update-copyright" can help with this. + Usually this is done at the beginning of the year for all files. * Check NEWS; specifically, ensure that all the substantive differences from the last release are included. Include bug numbers or mailing @@ -545,7 +546,7 @@ 1.16.92, ...) should be pretest releases. Leading up to a micro release (x.y.z), say 1.17.1, we would have 1.17.0.91 for the initial post-release development version, 1.17.0.92 for the first pretest, - etc. + etc. (Just "make" will fail after this; do "make bootstrap", as below.) Before 1.17 (July 2024), we used suffixed letters for pretests, as is traditional, but deficient sorting algorithms did not like that. The @@ -559,7 +560,7 @@ or pretests. E.g., APIVERSION=1.17 for the pretest 1.17.90, even though it's leading up to 1.18. -* grep $newversion NEWS # ensure that the NEWS file has the new version. +* grep -F $newversion NEWS # ensure that the NEWS file has the new version. * Create an announcement message with "make announcement". It's useful to do this early, because carefully reading the list of NEWS can @@ -581,7 +582,7 @@ because that command will remove *all* the files that are not tracked by git! Run git status first to ensure all removals are ok. -* git push all changed files. +* git commit && git push all changed files. * Run "make git-tag-release". This will run the maintainer checks, verify that the local git diff --git a/NEWS b/NEWS index 201f3995c..8edbf1781 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,18 @@ For planned incompatibilities in a possible future Automake 2.0 release, please see NEWS-future and start following the advice there now. -* Bugs fixed +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +New in 1.18.1 (2025-06-25): - - Improve debuggability of installcheck failures. (bug#78850) +* Bugs fixed - Undo change to mdate-sh; once again, it does not look at SOURCE_DATE_EPOCH. This change was a misunderstanding that causes problems, not fixes, for reproducible builds. (https://lists.gnu.org/archive/html/automake/2025-06/msg00021.html) + - Improve debuggability of installcheck failures. (bug#78850) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New in 1.18 (2025-05-25): diff --git a/configure.ac b/configure.ac index 76d743def..45ad7eb11 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.18.0.91], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.18.1], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) diff --git a/m4/amversion.m4 b/m4/amversion.m4 index c10af72c6..6fa353d51 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.18' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.18.0.91], [], +m4_if([$1], [1.18.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.18.0.91])dnl +[AM_AUTOMAKE_VERSION([1.18.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])