summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--lib/Smokeping.pm3
4 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 9301598..a1d2dbf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2011/09/28 -- released version 2.5.2
+2011/09/28 -- released version 2.6.0
* added automake support
diff --git a/Makefile.am b/Makefile.am
index 86927a3..aad7c09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,11 @@ SUBDIRS = bin doc etc htdocs lib
EXTRA_DIST = setup/build-perl-modules.sh setup/sdbs.inc
dist-hook:
- svn info >DIST_REVISION
+ echo Version $(PACKAGE_VERSION) >DIST_REVISION
+ svn info >>DIST_REVISION
cp DIST_REVISION $(distdir)/
+ $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s+=\s+".+?"/\$$VERSION = "$$d"/' $(distdir)/lib/Smokeping.pm
+
# date >DIST_REVISION
# git branch -vv >>DIST_REVISION
diff --git a/configure.ac b/configure.ac
index 930396f..38f3215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
#
-AC_INIT([smokeping],[2.5.2],[tobi@oetiker.ch])
+AC_INIT([smokeping],[2.6.0],[tobi@oetiker.ch])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(conftools)
AC_CANONICAL_TARGET
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index d0fabd1..1d68f62 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -67,7 +67,8 @@ use Smokeping::RRDtools;
# globale persistent variables for speedy
use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode);
-$VERSION="2.005001";
+
+$VERSION="2.006000";
# we want opts everywhere
my %opt;