# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1534015605 14400
# Node ID 5eeecebcd91a699ff94c546ee9b688755c81f2d1
# Parent  374edade7b1b8f8a1946d957bf150f7294061cf2# Parent  1f46d371968c5c2e9d5fac537046db8005b71e41
maint: Merge stable to default.

diff -r 374edade7b1b -r 5eeecebcd91a CITATION
--- 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.
diff -r 374edade7b1b -r 5eeecebcd91a configure.ac
--- 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
diff -r 374edade7b1b -r 5eeecebcd91a etc/icons/org.octave.Octave.appdata.xml
--- 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>
diff -r 374edade7b1b -r 5eeecebcd91a libgui/module.mk
--- 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
 
diff -r 374edade7b1b -r 5eeecebcd91a libinterp/module.mk
--- 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
 
diff -r 374edade7b1b -r 5eeecebcd91a liboctave/module.mk
--- 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