Mercurial > octave
changeset 22457:ae58225940da
maint: Merge away extra head on default branch.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 09 Sep 2016 15:39:58 -0400 |
parents | 8924139b4f21 (current diff) b8eeca55fa81 (diff) |
children | 30002d6568c4 |
files | |
diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Sep 09 12:17:23 2016 -0400 +++ b/configure.ac Fri Sep 09 15:39:58 2016 -0400 @@ -19,21 +19,21 @@ ### <http://www.gnu.org/licenses/>. AC_PREREQ([2.63]) -AC_INIT([GNU Octave], [4.1.0+], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [4.2.0-rc1], [http://octave.org/bugs.html], [octave]) dnl Note that the version number is duplicated here and in AC_INIT dnl because AC_INIT requires it to be static, not computed from dnl shell variables. OCTAVE_MAJOR_VERSION=4 -OCTAVE_MINOR_VERSION=1 -OCTAVE_PATCH_VERSION=0+ +OCTAVE_MINOR_VERSION=2 +OCTAVE_PATCH_VERSION=0-rc1 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_COPYRIGHT="Copyright (C) 2016 John W. Eaton and others." -OCTAVE_RELEASE_DATE="2015-05-26" +OCTAVE_RELEASE_DATE="2016-09-07" ## The "API version" is used as a way of checking that interfaces in the ## liboctave and libinterp libraries haven't changed in a backwardly @@ -47,7 +47,7 @@ ## libinterp, perhaps we should be computing the "api version" from ## those versions numbers in some way instead of setting it ## independently here. -OCTAVE_API_VERSION="api-v50+" +OCTAVE_API_VERSION="api-v51" AC_SUBST(OCTAVE_MAJOR_VERSION) AC_SUBST(OCTAVE_MINOR_VERSION)
--- a/libgui/module.mk Fri Sep 09 12:17:23 2016 -0400 +++ b/libgui/module.mk Fri Sep 09 15:39:58 2016 -0400 @@ -53,7 +53,7 @@ $(LIBOCTGUI_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: -libgui_liboctgui_current = 1 +libgui_liboctgui_current = 2 libgui_liboctgui_revision = 0 libgui_liboctgui_age = 0
--- a/libinterp/module.mk Fri Sep 09 12:17:23 2016 -0400 +++ b/libinterp/module.mk Fri Sep 09 15:39:58 2016 -0400 @@ -172,7 +172,7 @@ $(LIBOCTINTERP_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: -libinterp_liboctinterp_current = 3 +libinterp_liboctinterp_current = 4 libinterp_liboctinterp_revision = 0 libinterp_liboctinterp_age = 0
--- a/liboctave/module.mk Fri Sep 09 12:17:23 2016 -0400 +++ b/liboctave/module.mk Fri Sep 09 15:39:58 2016 -0400 @@ -79,7 +79,7 @@ $(LIBOCTAVE_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: -liboctave_liboctave_current = 3 +liboctave_liboctave_current = 4 liboctave_liboctave_revision = 0 liboctave_liboctave_age = 0