prep for 1.5.2

diff --git a/CHANGES b/CHANGES
index d07037e319589ff34423c247f12cd63a3d2791b7..b3a602325d96128ff2e977b33e20134de7ffee52 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,18 @@
-RRDtool 1.5.1 - 2015-04-20
+RRDtool 1.5.2 - 2015-04-23
 ==========================
 Bug Fixes
---------
-* parse numbers up to 40 characters long ...
+---------
+* paramters in VDEF are vnames and not data source names, hence
+  they can be 255 chars long and not only 20
+
+RRDtool 1.5.1 - 2015-04-22
+==========================
+Bug Fixes
+---------
+* parse numbers up to 40 characters long ..
+* fix install rules for Python and Lua
 * include missing VERSION and LICENSE file
+* unlink before rename in rrd_create when running on WIN32
 
 RRDtool 1.5.0 - 2015-04-16
 ==========================

diff --git a/Makefile.in b/Makefile.in
index 9c1c42968c212461e3e1b294f51bfc890feaf2db..ff88c541c663097dcb6cacf8026792d5dcc3bb7d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -450,7 +450,7 @@ RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
 SUBDIRS = po src doc bindings tests $(am__append_1)
-EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS \
+EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
              rrdtool.spec favicon.ico bootstrap \
              libtool \
              m4/snprintf.m4 \

diff --git a/VERSION b/VERSION
index 26ca594609a93d60b6543102d639fa76b50a6925..4cda8f19edc7ffa01ba13d5dbe4909a6dc2ce3c8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.1
+1.5.2

diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index 05476efc55265ed66858bdc1a2226c38c8b44c86..c787210fab87f4382f48d5d22e6d34a5593a275a 100644 (file)
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -723,8 +723,8 @@ install-data-local:
            && ( cd ${builddir}/python \
                 && env BUILDLIBDIR=${abs_top_builddir}/src/.libs \
                   $(PYTHON) ${abs_srcdir}/python/setup.py install \
-                     --skip-build --prefix=$(DESTDIR)$(prefix) \
-                     --exec-prefix=$(DESTDIR)$(exec_prefix) ) \
+                     --skip-build --root=$(DESTDIR) --prefix=$(prefix) \
+                     --exec-prefix=$(exec_prefix)) \
            || true
 
 # rules for building the ruby module

diff --git a/configure b/configure
index 44cb3c3d0826639e3c30da7b6a3baa2203e0df62..d1aa3352e61328ad36b8e6f4974613ad8e375904 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 rrdtool 1.5.0.
+# Generated by GNU Autoconf 2.69 for rrdtool 1.5.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rrdtool'
 PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='rrdtool 1.5.0'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='rrdtool 1.5.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1479,7 +1479,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 rrdtool 1.5.0 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rrdtool 1.5.0:";;
+     short | recursive ) echo "Configuration of rrdtool 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1734,7 +1734,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rrdtool configure 1.5.0
+rrdtool configure 1.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2439,7 +2439,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 rrdtool $as_me 1.5.0, which was
+It was created by rrdtool $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2823,7 +2823,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-NUMVERS=1.499915022217
+NUMVERS=1.5001
 
 
 LIBVERS=7:0:3
@@ -4795,7 +4795,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rrdtool'
- VERSION='1.5.0'
+ VERSION='1.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21147,7 +21147,7 @@ fi
           done
         fi
 
-        LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
+        LUA_RRD_LIBDIR="$libdir/lua/$lua_vdot"
         # if lua 5.0 can't find compat-5.1, force installation of
         # compat-5.1.lua together with RRDtool.
         if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then
@@ -22465,7 +22465,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 rrdtool $as_me 1.5.0, which was
+This file was extended by rrdtool $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22531,7 +22531,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="\\
-rrdtool config.status 1.5.0
+rrdtool config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25113,7 +25113,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 rrdtool $as_me 1.5.0, which was
+This file was extended by rrdtool $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25179,7 +25179,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="\\
-rrdtool config.status 1.5.0
+rrdtool config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"