Mercurial > jwe > octave
changeset 27819:83c748eb9fbd
maint: merge stable to default.
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Fri, 13 Dec 2019 11:35:05 +0900 |
| parents | 392c03df4565 (current diff) 230c20b02682 (diff) |
| children | bad702797afb |
| files | CITATION configure.ac etc/HACKING.md etc/icons/org.octave.Octave.appdata.xml libgui/module.mk |
| diffstat | 6 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/CITATION Thu Dec 12 15:45:34 2019 -0800 +++ b/CITATION Fri Dec 13 11:35:05 2019 +0900 @@ -1,17 +1,17 @@ To cite GNU Octave in publications use: John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2019). - GNU Octave version 5.1.0 manual: a high-level interactive language for + GNU Octave version 5.2.0 manual: a high-level interactive language for numerical computations. - URL https://www.gnu.org/software/octave/doc/v5.1.0/ + URL https://www.gnu.org/software/octave/doc/v5.2.0/ A BibTeX entry for LaTeX users is: @manual{, - title = {{GNU Octave} version 5.1.0 manual: a high-level interactive language for numerical computations}, + title = {{GNU Octave} version 5.2.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 = {2019}, - url = {https://www.gnu.org/software/octave/doc/v5.1.0/}, + url = {https://www.gnu.org/software/octave/doc/v5.2.0/}, } We have invested a lot of time and effort in creating GNU Octave, please
--- a/etc/HACKING.md Thu Dec 12 15:45:34 2019 -0800 +++ b/etc/HACKING.md Fri Dec 13 11:35:05 2019 +0900 @@ -386,7 +386,8 @@ * Programs may need to be changed, recompiled, and relinked in order to use the new version. Bump current, set revision and age to 0. -These guidelines also appear in the automake manual. +These guidelines also appear in the GNU libtool manual, see +https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html. ################################################################################
--- a/etc/icons/org.octave.Octave.appdata.xml Thu Dec 12 15:45:34 2019 -0800 +++ b/etc/icons/org.octave.Octave.appdata.xml Fri Dec 13 11:35:05 2019 +0900 @@ -122,6 +122,7 @@ <developer_name>John W. Eaton and others</developer_name> <content_rating type="oars-1.0"/> <releases> + <release date="2019-12-14" version="5.1.90"/> <release date="2019-02-23" version="5.1.0"/> <release date="2018-08-09" version="4.4.1"/> <release date="2018-04-30" version="4.4.0"/>
--- a/libgui/module.mk Thu Dec 12 15:45:34 2019 -0800 +++ b/libgui/module.mk Fri Dec 13 11:35:05 2019 +0900 @@ -63,7 +63,7 @@ ## to the rules in the etc/HACKING.md file: %canon_reldir%_liboctgui_current = 5 -%canon_reldir%_liboctgui_revision = 0 +%canon_reldir%_liboctgui_revision = 1 %canon_reldir%_liboctgui_age = 0 %canon_reldir%_liboctgui_version_info = $(%canon_reldir%_liboctgui_current):$(%canon_reldir%_liboctgui_revision):$(%canon_reldir%_liboctgui_age)
--- a/libinterp/module.mk Thu Dec 12 15:45:34 2019 -0800 +++ b/libinterp/module.mk Fri Dec 13 11:35:05 2019 +0900 @@ -151,7 +151,7 @@ ## to the rules in the etc/HACKING.md file: %canon_reldir%_liboctinterp_current = 7 -%canon_reldir%_liboctinterp_revision = 0 +%canon_reldir%_liboctinterp_revision = 1 %canon_reldir%_liboctinterp_age = 0 %canon_reldir%_liboctinterp_version_info = $(%canon_reldir%_liboctinterp_current):$(%canon_reldir%_liboctinterp_revision):$(%canon_reldir%_liboctinterp_age)
--- a/liboctave/module.mk Thu Dec 12 15:45:34 2019 -0800 +++ b/liboctave/module.mk Fri Dec 13 11:35:05 2019 +0900 @@ -86,7 +86,7 @@ ## to the rules in the etc/HACKING.md file: %canon_reldir%_%canon_reldir%_current = 7 -%canon_reldir%_%canon_reldir%_revision = 0 +%canon_reldir%_%canon_reldir%_revision = 1 %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)