final preparations for version 2.4 release

diff --git a/CHANGES b/CHANGES
index d0996f8de52d58814b95c3e4ede163effecf66ea..a95c67768f0081d77a4e24483ba509cdf9ede7ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2.4 / <not released yet>
+2.4 / 18-Aug-2019
 
  - Fixed
    - Daemon didn't correctly wait when acquiring database lock for data write

diff --git a/UPGRADE.md b/UPGRADE.md
index df3c373ec9855057d184fdf0e581d21a51b84b94..c0a2f47ec3b14f4a5dffac896e0e684954f5babe 100644 (file)
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,6 +1,8 @@
 
 # New configuration settings
 
+ * 2.4: (none)
+
  * 2.3: DatabaseWriteAheadLogging, DatabaseSynchronous
 
  * 2.2: 64bitInterfaceCounters

diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf
index 59a9e97dfacaa71e6e6df45fef85875c30ecc014..d206b0bf4a457a451054db89457bf4543da39130 100644 (file)
--- a/cfg/vnstat.conf
+++ b/cfg/vnstat.conf
@@ -1,4 +1,4 @@
-# vnStat 2.3 config file
+# vnStat 2.4 config file
 ##
 
 # default interface (leave empty for automatic selection)

diff --git a/configure b/configure
index 2ab9964ae5963771b17403ed44728b8567035931..476f272826fe81581cda8f97b49425e4161bdc2c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vnstat 2.4_beta1.
+# Generated by GNU Autoconf 2.69 for vnstat 2.4.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vnstat'
 PACKAGE_TARNAME='vnstat'
-PACKAGE_VERSION='2.4_beta1'
-PACKAGE_STRING='vnstat 2.4_beta1'
+PACKAGE_VERSION='2.4'
+PACKAGE_STRING='vnstat 2.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vnstat 2.4_beta1 to adapt to many kinds of systems.
+\`configure' configures vnstat 2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vnstat 2.4_beta1:";;
+     short | recursive ) echo "Configuration of vnstat 2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,7 +1488,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vnstat configure 2.4_beta1
+vnstat configure 2.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2083,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vnstat $as_me 2.4_beta1, which was
+It was created by vnstat $as_me 2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2949,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='vnstat'
- VERSION='2.4_beta1'
+ VERSION='2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6308,7 +6308,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vnstat $as_me 2.4_beta1, which was
+This file was extended by vnstat $as_me 2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6374,7 +6374,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vnstat config.status 2.4_beta1
+vnstat config.status 2.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 801610619f66dd22fb431195b07622d242cee415..22a03b920956096efbb0bf23e2d1c1ac4a367b05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([vnstat], [2.4_beta1])
+AC_INIT([vnstat], [2.4])
 AM_INIT_AUTOMAKE([foreign subdir-objects std-options -Wall -Werror])
 AM_MAINTAINER_MODE
 

diff --git a/man/vnstat.1 b/man/vnstat.1
index 647b92cf5e6443ab64b6b4bfa8a71e2fae240b4c..6750e0b1dd24f3965921df6390b02adb682945cf 100644 (file)
--- a/man/vnstat.1
+++ b/man/vnstat.1
@@ -1,4 +1,4 @@
-.TH VNSTAT 1 "JULY 2019" "version 2.3" "User Manuals"
+.TH VNSTAT 1 "AUGUST 2019" "version 2.4" "User Manuals"
 .SH NAME
 vnstat \- a console-based network traffic monitor
 

diff --git a/man/vnstat.conf.5 b/man/vnstat.conf.5
index 10c8985692e81a41d0d2b92fbcf5c81c6f63ba3d..03b0c24212fbf5ca04792e7bf6dc88eef8a0a9b4 100644 (file)
--- a/man/vnstat.conf.5
+++ b/man/vnstat.conf.5
@@ -1,4 +1,4 @@
-.TH VNSTAT.CONF 5 "JULY 2019" "version 2.3" "User Manuals"
+.TH VNSTAT.CONF 5 "AUGUST 2019" "version 2.4" "User Manuals"
 .SH NAME
 vnstat.conf \- vnStat configuration file
 

diff --git a/man/vnstatd.8 b/man/vnstatd.8
index ae96bd241be0e3aa1e1a653c58c03220a77d478d..11f37e723a8f4713abb90e7c4f12cfcbe12b2a9f 100644 (file)
--- a/man/vnstatd.8
+++ b/man/vnstatd.8
@@ -1,4 +1,4 @@
-.TH VNSTATD 8 "JULY 2019" "version 2.3" "User Manuals"
+.TH VNSTATD 8 "AUGUST 2019" "version 2.4" "User Manuals"
 .SH NAME
 vnstatd \- daemon based database updating for vnStat
 

diff --git a/man/vnstati.1 b/man/vnstati.1
index 55e6d430d6b33412daea9fed940d94588ca593a3..5a53cdb3bc15a0ec7b7dd0f63512e0bb10709ff5 100644 (file)
--- a/man/vnstati.1
+++ b/man/vnstati.1
@@ -1,4 +1,4 @@
-.TH VNSTATI 1 "JULY 2019" "version 2.3" "User Manuals"
+.TH VNSTATI 1 "AUGUST 2019" "version 2.4" "User Manuals"
 .SH NAME
 vnstati \- png image output support for vnStat