Mercurial > octave
changeset 29735:32d345451ccc
maint: Merge stable to default.
* configure.ac (OCTAVE_API_VERSION): Set to api-v56+ since version was
bumped on stable.
* liboctave/module.mk, libinterp/module.mk, libgui/module.mk:
Likewise, for library versions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 06 Jun 2021 10:50:17 -0400 |
| parents | 952f1ad2dd8d (current diff) 9d70a797d54a (diff) |
| children | 00e72e6d854e |
| files | configure.ac libgui/module.mk libinterp/module.mk liboctave/module.mk |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Jun 06 10:47:09 2021 -0400 +++ b/configure.ac Sun Jun 06 10:50:17 2021 -0400 @@ -63,7 +63,7 @@ dnl FIXME: Since we also set libtool versions for liboctave and libinterp, dnl perhaps we should be computing the "api version" from those versions numbers dnl in some way instead of setting it independently here. -OCTAVE_API_VERSION="api-v55+" +OCTAVE_API_VERSION="api-v56+" AC_SUBST(OCTAVE_MAJOR_VERSION) AC_SUBST(OCTAVE_MINOR_VERSION)
--- a/libgui/module.mk Sun Jun 06 10:47:09 2021 -0400 +++ b/libgui/module.mk Sun Jun 06 10:50:17 2021 -0400 @@ -63,9 +63,9 @@ ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: -%canon_reldir%_liboctgui_current = 6 +%canon_reldir%_liboctgui_current = 7 %canon_reldir%_liboctgui_revision = 0 -%canon_reldir%_liboctgui_age = 0 +%canon_reldir%_liboctgui_age = 1 %canon_reldir%_liboctgui_version_info = $(%canon_reldir%_liboctgui_current):$(%canon_reldir%_liboctgui_revision):$(%canon_reldir%_liboctgui_age)
--- a/libinterp/module.mk Sun Jun 06 10:47:09 2021 -0400 +++ b/libinterp/module.mk Sun Jun 06 10:50:17 2021 -0400 @@ -150,7 +150,7 @@ ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: -%canon_reldir%_liboctinterp_current = 8 +%canon_reldir%_liboctinterp_current = 9 %canon_reldir%_liboctinterp_revision = 0 %canon_reldir%_liboctinterp_age = 0
--- a/liboctave/module.mk Sun Jun 06 10:47:09 2021 -0400 +++ b/liboctave/module.mk Sun Jun 06 10:50:17 2021 -0400 @@ -86,7 +86,7 @@ ## to the rules in the etc/HACKING.md file: %canon_reldir%_%canon_reldir%_current = 8 -%canon_reldir%_%canon_reldir%_revision = 0 +%canon_reldir%_%canon_reldir%_revision = 2 %canon_reldir%_%canon_reldir%_age = 0 %canon_reldir%_%canon_reldir%_version_info = $(%canon_reldir%_%canon_reldir%_current):$(%canon_reldir%_%canon_reldir%_revision):$(%canon_reldir%_%canon_reldir%_age)