version 2019-10-25

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 4b866b374df074899ed2bb48a2d213d75dec7ce4..e6a653df67291f007c2121e68fddbe1b0eb89d8a 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -419,8 +419,8 @@ $(PGPEWRAP): $(PGPEWRAPOBJS)
 
 # generated
 git_ver.c: $(ALL_FILES)
-       version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | \
-               sed -e 's/^neomutt-[0-9]\{8\}//; s/-g\([a-z0-9]\{6\}\)/-\1/'`; \
+       version=`git describe --dirty --abbrev=6 --match "20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]" 2> /dev/null | \
+               sed -e 's/[0-9]\{4\}-[0-9][0-9]-[0-9][0-9]//; s/-g\([a-z0-9]\{6\}\)/-\1/'`; \
        echo 'const char *GitVer = "'$$version'";' > $@.tmp; \
        cmp -s $@.tmp $@ || mv $@.tmp $@; \
        rm -f $@.tmp

diff --git a/auto.def b/auto.def
index 1b92e27db237643ba74f36ff0e0daccc9dffe67c..c91355d9ffc0adb936405128765e89ad8bfd2025 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -16,7 +16,7 @@ use system cc cc-lib mutt-gettext mutt-iconv pkg-config
 ###############################################################################
 # Names and versions
 define PACKAGE          "neomutt"
-define PACKAGE_VERSION  "20180716"
+define PACKAGE_VERSION  "2019-10-25"
 define BUGS_ADDRESS     "neomutt-devel@neomutt.org"
 
 # Subdirectories that contain additional Makefile.autosetup files
@@ -1151,8 +1151,7 @@ define VPATH $vpath
 ###############################################################################
 # Define package timestamp (UTC) based on PACKAGE_VERSION for:
 # doc/neomuttrc.5, doc/neomutt.1
-define PACKAGE_DATE \
-  [regsub {(....)(..)(..)} [get-define PACKAGE_VERSION] {\1-\2-\3}]
+define PACKAGE_DATE [get-define PACKAGE_VERSION]
 
 ###############################################################################
 # Generate Makefile and config.h

diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf
index 6dcb43cd5c603e0ef7c0c6ddf59af3257bf1589b..858ace302a224ecd47e558d651efa8f7899cad2d 100644 (file)
--- a/doxygen/doxygen.conf
+++ b/doxygen/doxygen.conf
@@ -25,7 +25,7 @@ PROJECT_NAME           = "NeoMutt"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2018-07-16
+PROJECT_NUMBER         = "2019-10-25"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a