From: Karl Berry Date: Fri, 27 Jun 2025 16:54:57 +0000 (-0700) Subject: maint: 1.18.1 released, version now 1.18.1.91. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e6846528c427f9c8184f477ec8a00d5a5a1fcb9;p=thirdparty%2Fautomake.git maint: 1.18.1 released, version now 1.18.1.91. * configure.ac (AC_INIT): now 1.18.1.91. * m4/amversion.m4 (AM_AUTOMAKE_VERSION): 1.18.1.91 (auto-update). * HACKING: release tweaks. --- diff --git a/HACKING b/HACKING index 10328125b..1d7552829 100644 --- a/HACKING +++ b/HACKING @@ -611,10 +611,10 @@ --news=NEWS \ --url-directory=https://$host.gnu.org/gnu/$pkg and merge this with the just-written announcement file. - Make sure the final text does not include "no matching" lines. + Check the final text does not include "no matching" lines. -* Run "make git-upload-release". - For pretest releases: "DEVEL_SNAPSHOT=1 make git-upload-release". +* For official releases: make git-upload-release + For pretest releases: DEVEL_SNAPSHOT=1 make git-upload-release This will first verify that you are releasing from a tagged version and that the local git repository and working tree are clean and @@ -627,14 +627,13 @@ appear on the server. If you need to sign with a non-default key, you can use: - "make GNUPLOADFLAGS='--user KEY' git-upload-release" + make GNUPLOADFLAGS='--user KEY' git-upload-release -* Push the new release tag: git push origin master tag v$(VERSION). +* Push the new release tag: git push origin master tag v$(VERSION) You can view unpushed local-only tags with git push --tags --dry-run (and push them by omitting the --dry-run, if there are no extras). * For stable releases you also need to update the manuals on www.gnu.org. - - Check links (except do this before the release): make html make checklinkx # various perl prerequisites, see contrib/checklinkx @@ -643,7 +642,6 @@ - Generate manuals (with the help of the standard gendocs.sh script): make web-manual - The ready-to-be-uploaded manuals (in several formats) will be left in the 'doc/web-manual' directory. diff --git a/configure.ac b/configure.ac index 45ad7eb11..bb3c882eb 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.1], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.18.1.91], [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 6fa353d51..399d19056 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.1], [], +m4_if([$1], [1.18.1.91], [], [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.1])dnl +[AM_AUTOMAKE_VERSION([1.18.1.91])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])