get ready for 1.4.9

diff --git a/.travis.yml b/.travis.yml
index a839f8950418feee8c9c40a10c43d9d540a61385..d04426d383a4e31a4a3b38bf7243e48b44af8ac2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
   - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev dc
 
 before_script:
-  - ./MakeMakefile
+  - ./bootstrap.sh
 
 script:
   - ./configure

diff --git a/CHANGES b/CHANGES
index d4c6fd1efdd33e6ad185036c7bbbe5f2feaea62c..2458888d15583ac1b4a1a664c1a3f51adee46781 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,27 @@
+RRDtool 1.4.9 - 2014-09-29
+==========================
+
+New Features
+------------
+* allows rrdrestore to read input from stdin
+* add documentation for RRDs::xport
+* RPN operators MINNAN and MAXNAN
+* --left-axis-format option to rrd_graph
+
+Bugfixes
+--------
+* properly verify validity of user suplied format strings
+* remove graph functions from python module when compiled without graphing
+  support
+* verify that only short integers are used in COMPUTE rpn expressions 
+* eliminate duplicate setlocale calls
+* fixed endless loop and double frees in rrd_restore
+* fixed missing variable initializations in rrd_graph
+* fixed JSON output format to actually be valid JSON
+* detect failing fallocate and fall back to seeking
+* fixed format string in ruby bindings
+
+
 RRDtool 1.4.8 - 2012-05-23
 ==========================
 

diff --git a/Makefile.am b/Makefile.am
index 236c2485ccf850b272817b0d09e4b4abd165e1a5..7055e073f70cde28bcf166af30d6ceee5807f937 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ RSYNC = rsync --rsh=ssh
 SUBDIRS = po src examples doc bindings
 
  # the following files are not mentioned in any other Makefile
-EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
+EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS VERSION bootstrap.sh\
             rrdtool.spec favicon.ico  autogen.sh \
              libtool \
              netware/Makefile  \

diff --git a/configure.ac b/configure.ac
index 059ca8b19e6e4c02c5b24a5b1324090e4c3e44ee..651d301b87de2c1d518e12c56a44d6ca20246480 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PREREQ(2.59)
 
 dnl the official version number is
 dnl a.b.c
-AC_INIT([rrdtool],[1.4.8])
+AC_INIT([rrdtool],m4_esyscmd([tr -d '\n' < VERSION]),[support@oetiker.ch])
 
 dnl for testing a numberical version number comes handy
 dnl the released version are
@@ -31,7 +31,7 @@ dnl - if any functionality was removed do c++,r=0,a=0.
 dnl
 dnl see http://sourceware.org/autobook/autobook/autobook_91.html
 dnl 
-LIBVERS=6:1:2
+LIBVERS=6:2:2
 AC_SUBST(LIBVERS)
 
 AC_CANONICAL_TARGET