Mercurial > octave
changeset 25772:5eeecebcd91a
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 11 Aug 2018 15:26:45 -0400 |
| parents | 374edade7b1b (current diff) 1f46d371968c (diff) |
| children | e222da9beaac |
| files | configure.ac libgui/module.mk libinterp/module.mk liboctave/module.mk |
| diffstat | 6 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/CITATION Fri Aug 10 14:59:42 2018 -0700 +++ b/CITATION Sat Aug 11 15:26:45 2018 -0400 @@ -1,9 +1,9 @@ To cite GNU Octave in publications use: John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2018). - GNU Octave version 4.4.0 manual: a high-level interactive language for + GNU Octave version 4.4.1 manual: a high-level interactive language for numerical computations. - URL https://www.gnu.org/software/octave/doc/v4.4.0/ + URL https://www.gnu.org/software/octave/doc/v4.4.1/ A BibTeX entry for LaTeX users is: @@ -11,8 +11,9 @@ title = {{GNU Octave} version 4.4.0 manual: a high-level interactive language for numerical computations}, author = {John W. Eaton and David Bateman and S{\o}ren Hauberg and Rik Wehbring}, year = {2018}, - url = {https://www.gnu.org/software/octave/doc/v4.4.0/}, + url = {https://www.gnu.org/software/octave/doc/v4.4.1/}, } -We have invested a lot of time and effort in creating GNU Octave, please cite it -when using it. See also `citation pkgname' for citing Octave packages. +We have invested a lot of time and effort in creating GNU Octave, please +cite it when using it. See also `citation pkgname' for citing Octave +packages.
--- a/configure.ac Fri Aug 10 14:59:42 2018 -0700 +++ b/configure.ac Sat Aug 11 15:26:45 2018 -0400 @@ -41,7 +41,7 @@ OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others." -OCTAVE_RELEASE_DATE="2018-07-30" +OCTAVE_RELEASE_DATE="2018-08-09" ## The "API version" is used as a way of checking that interfaces in the ## liboctave and libinterp libraries haven't changed in a backwardly
--- a/etc/icons/org.octave.Octave.appdata.xml Fri Aug 10 14:59:42 2018 -0700 +++ b/etc/icons/org.octave.Octave.appdata.xml Sat Aug 11 15:26:45 2018 -0400 @@ -80,6 +80,7 @@ <project_group>GNU</project_group> <developer_name>John W. Eaton and others</developer_name> <releases> + <release date="2018-04-30" version="4.4.1"/> <release date="2018-04-30" version="4.4.0"/> <release date="2018-03-13" version="4.2.2"/> </releases>
--- a/libgui/module.mk Fri Aug 10 14:59:42 2018 -0700 +++ b/libgui/module.mk Sat Aug 11 15:26:45 2018 -0400 @@ -61,7 +61,7 @@ ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: -%canon_reldir%_liboctgui_current = 3 +%canon_reldir%_liboctgui_current = 4 %canon_reldir%_liboctgui_revision = 0 %canon_reldir%_liboctgui_age = 0
--- a/libinterp/module.mk Fri Aug 10 14:59:42 2018 -0700 +++ b/libinterp/module.mk Sat Aug 11 15:26:45 2018 -0400 @@ -156,7 +156,7 @@ ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: -%canon_reldir%_liboctinterp_current = 5 +%canon_reldir%_liboctinterp_current = 6 %canon_reldir%_liboctinterp_revision = 0 %canon_reldir%_liboctinterp_age = 0
--- a/liboctave/module.mk Fri Aug 10 14:59:42 2018 -0700 +++ b/liboctave/module.mk Sat Aug 11 15:26:45 2018 -0400 @@ -85,7 +85,7 @@ ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: -%canon_reldir%_%canon_reldir%_current = 5 +%canon_reldir%_%canon_reldir%_current = 6 %canon_reldir%_%canon_reldir%_revision = 0 %canon_reldir%_%canon_reldir%_age = 0