From 9ec19184fe3df21f20417c4f73ffe46f9610b5c7 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 18 Jun 2017 19:11:08 +0200 Subject: [PATCH] maint: Post-release administrivia * NEWS: Add header line for next release. * configure.ac (AC_INIT): Bump version number to 1.15.1a. * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). --- NEWS | 4 ++++ configure.ac | 2 +- m4/amversion.m4 | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1a0ccc9af..92be90634 100644 --- a/NEWS +++ b/NEWS @@ -62,6 +62,10 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +New in ?.?.?: + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + New in 1.15.1: * Bugs fixed: diff --git a/configure.ac b/configure.ac index 49a25a3c7..afdfd5c8a 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.15.1], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.15.1a], [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 a848b0ea8..2a3ffec18 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' 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.15.1], [], +m4_if([$1], [1.15.1a], [], [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.15.1])dnl +[AM_AUTOMAKE_VERSION([1.15.1a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- 2.11.4.GIT