summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2005-05-11 21:58:21 +0200
committerTobi Oetiker <tobi@oetiker.ch>2005-05-11 21:58:21 +0200
commit83ab1432a8f085b2139cab8a61227b80e5b319b4 (patch)
tree5644042c250a832a71eafdd006831ecad8ad30ab
parentef0a8b6b72eff929a9f6a414e16db33ec3fac07d (diff)
downloadsmokeping-83ab1432a8f085b2139cab8a61227b80e5b319b4.tar.gz
smokeping-83ab1432a8f085b2139cab8a61227b80e5b319b4.tar.xz
prepare for the release of smokeping-2.0rc4
-rw-r--r--CHANGES1
-rw-r--r--Makefile8
-rwxr-xr-xbin/smokeping.dist2
-rwxr-xr-xhtdocs/smokeping.cgi.dist2
-rw-r--r--lib/Smokeping.pm2
5 files changed, 10 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 3f808da..87b7aaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+2005/05/11 - publish rc4 (tobi)
* Curl now has a new 'insecure_ssl' option for those not caring about CA paths
-- niko, original patch by Marc Spitzer <mspitzer *gmail.com>
* document '@include' and its friends in smokeping_config in addition to
diff --git a/Makefile b/Makefile
index d4d9b71..af579e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
SHELL = /bin/sh
-VERSION = 2.0rc3
-NUMVERSION = 1.99004
+VERSION = 2.0rc4
+NUMVERSION = 1.99005
IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|.svn
GROFF = groff
.PHONY: man html txt ref examples check-examples patch killdoc doc tar rename-man symlinks remove-symlinks
@@ -140,3 +140,7 @@ tar: doc patch
dist: tar
mv smokeping-$(VERSION).tar.gz /home/oetiker/public_html/webtools/smokeping/pub/
cp CHANGES /home/oetiker/public_html/webtools/smokeping/pub/CHANGES
+
+tag: dist
+ svn commit -m "prepare for the release of smokeping-$(VERSION)"
+ svn copy -m "tagging version $(VERSION)" svn://svn.ee.ethz.ch/smokeping/branches/2.0 svn://svn.ee.ethz.ch/smokeping/tags/$VERSION
diff --git a/bin/smokeping.dist b/bin/smokeping.dist
index 8472a9d..e6a13ab 100755
--- a/bin/smokeping.dist
+++ b/bin/smokeping.dist
@@ -4,7 +4,7 @@
use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
use lib qw(lib);
-use Smokeping 1.99004;
+use Smokeping 1.99005;
Smokeping::main("etc/config.dist");
diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist
index 4a1c34c..a5801b4 100755
--- a/htdocs/smokeping.cgi.dist
+++ b/htdocs/smokeping.cgi.dist
@@ -5,7 +5,7 @@ use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
use CGI::Carp qw(fatalsToBrowser);
-use Smokeping 1.99004;
+use Smokeping 1.99005;
Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index caaeab0..7be666d 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -20,7 +20,7 @@ use Smokeping::RRDtools;
# globale persistent variables for speedy
use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode);
-$VERSION="1.99004";
+$VERSION="1.99005";
# we want opts everywhere
my %opt;