From 257d1db50090adb2bc4df1a0b3413ee8bdf0c8e2 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 29 Sep 2014 21:37:12 +0200
Subject: [PATCH] get ready for 1.4.9

---
 .travis.yml  |  2 +-
 CHANGES      | 24 ++++++++++++++++++++++++
 Makefile.am  |  2 +-
 configure.ac |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a839f895..d04426d3 100644
--- 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 d4c6fd1e..2458888d 100644
--- 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 236c2485..7055e073 100644
--- 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 059ca8b1..651d301b 100644
--- 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
-- 
2.47.2