From 066be4fc8773e1957e291198050527d1de3cd165 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Wed, 18 Oct 2017 11:34:35 +0300 Subject: Version 3.3 * NEWS: Update. * configure.ac: Update. * Makefile.am (dist-hook): Fix conditional. --- Makefile.am | 28 +++++++++++++++------------- NEWS | 12 ++++++------ configure.ac | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9ea2fc1f8..dd3093ab7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,19 +142,21 @@ ChangeLog: fi dist-hook: ChangeLog - @PATCHLEV=`echo "$(PACKAGE_VERSION)" | sed -r "s/[0-9]+\.[0-9]+\.?//"`;\ - if test $${PATCHLEV:-0} -lt 50; then \ - if head -n 6 ChangeLog | grep -q 'Uncommitted changes' ; \ - then \ - echo >&2 "*** Source tree contains uncommitted changes"; \ - echo >&2 "*** Aborting"; \ - exit 1; \ - fi; \ - if grep -q FIXME NEWS; then \ - echo >&2 "*** NEWS file contains FIXMEs"; \ - echo >&2 "*** Aborting"; \ - exit 1; \ - fi; \ + @if test -f ChangeLog && test -f NEWS; then \ + PATCHLEV=`echo "$(PACKAGE_VERSION)" | sed -r "s/[0-9]+\.[0-9]+\.?//"`;\ + if test $${PATCHLEV:-0} -lt 50; then \ + if head -n 6 ChangeLog | grep -q 'Uncommitted changes' ; \ + then \ + echo >&2 "*** Source tree contains uncommitted changes"; \ + echo >&2 "*** Aborting"; \ + exit 1; \ + fi; \ + if grep -q FIXME NEWS; then \ + echo >&2 "*** NEWS file contains FIXMEs"; \ + echo >&2 "*** Aborting"; \ + exit 1; \ + fi; \ + fi; \ fi alpha: diff --git a/NEWS b/NEWS index 541db0c11..140b51893 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,11 @@ -GNU mailutils NEWS -- history of user-visible changes. 2017-10-10 +GNU mailutils NEWS -- history of user-visible changes. 2017-10-18 Copyright (C) 2002-2017 Free Software Foundation, Inc. See the end of file for copying conditions. Please send mailutils bug reports to . -Version 3.2.94 (Git) +Version 3.3 - 2017-10-18 * TLS configuration @@ -71,16 +71,16 @@ is the same as for the global section described above, e.g.: } If the "tls" section is absent, but "tls-mode" is specified and it's -value is anything but "no", the settings from the global "tls" section -will be used. In this case, it is an error if the global "tls" -section is not defined. +value is not "no", the settings from the global "tls" section will be +used. In this case, it is an error if the global "tls" section is not +defined. * Source location API Libmailutils provides functions for keeping track of locations in source files for diagnostic purposes. -* Improve error reporting +* Improved error reporting * AM_GNU_MAILUTILS autoconf macro diff --git a/configure.ac b/configure.ac index ebd55c44e..3858aea5a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License along dnl with GNU Mailutils. If not, see . AC_PREREQ(2.63) -AC_INIT([GNU Mailutils], [3.2.94], [bug-mailutils@gnu.org], [mailutils], +AC_INIT([GNU Mailutils], [3.3], [bug-mailutils@gnu.org], [mailutils], [http://mailutils.org]) AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c]) AC_CONFIG_AUX_DIR([build-aux]) -- cgit v1.2.1