summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2008-06-13 14:01:50 +0200
committerTobi Oetiker <tobi@oetiker.ch>2008-06-13 14:01:50 +0200
commit84a43df0c40d9e384c99f58ebec6751f26184f69 (patch)
treec27ce87795ecc2569facf9c5cf9324c9b50d72c3
parenta5e329fddd18ad7ed43edbcd37f0979a189c6979 (diff)
downloadsmokeping-84a43df0c40d9e384c99f58ebec6751f26184f69.tar.gz
smokeping-84a43df0c40d9e384c99f58ebec6751f26184f69.tar.xz
fixed version string creation in javascript output
-rw-r--r--CHANGES4
-rw-r--r--Makefile4
-rw-r--r--lib/Smokeping/Graphs.pm1
-rw-r--r--qooxdoo/source/class/Tr/ui/ActionButton.js4
4 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 3c1d65a..87fa17e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2008/6/13 -- released version 2.4.1
+
+* fixed js packaging error ... s/VERSION/x/ was a bad idea
+
2008/6/10 -- released version 2.4.0
* building a --static version of the smokeping page is broken. Make
diff --git a/Makefile b/Makefile
index 4713d17..7ec085c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
SHELL = /bin/sh
-VERSION := 2.4.0
+VERSION := 2.4.1
SVNREPO = svn://svn.oetiker.ch/smokeping
############ A is for features
############ B is for bugfixes
@@ -175,7 +175,7 @@ smokeping-$(VERSION).tar.gz:
cp -rp build/perl/* ../lib;\
make clean; \
rm -rf build)
- $(PERL) -i -p -e 's/VERSION/$(VERSION)/' smokeping-$(VERSION)/htdocs/script/Tr.js
+ $(PERL) -i -p -e 's/SmokeTrace VERSION/SmokeTrace $(VERSION)/' smokeping-$(VERSION)/htdocs/script/Tr.js
tar czvf smokeping-$(VERSION).tar.gz --exclude '*.tmp' smokeping-$(VERSION)
rm -rf smokeping-$(VERSION)
diff --git a/lib/Smokeping/Graphs.pm b/lib/Smokeping/Graphs.pm
index 8d13cbe..0791796 100644
--- a/lib/Smokeping/Graphs.pm
+++ b/lib/Smokeping/Graphs.pm
@@ -324,6 +324,7 @@ sub get_multi_detail ($$$$;$){
return $page;
}
+
1;
__END__
diff --git a/qooxdoo/source/class/Tr/ui/ActionButton.js b/qooxdoo/source/class/Tr/ui/ActionButton.js
index ae04efb..5633d99 100644
--- a/qooxdoo/source/class/Tr/ui/ActionButton.js
+++ b/qooxdoo/source/class/Tr/ui/ActionButton.js
@@ -118,7 +118,7 @@ qx.Class.define('Tr.ui.ActionButton',
var history_action = function(event){
var targ = event.getData();
host.setValue(targ);
- history.addToHistory(targ,'SmokeTraceroute to '+targ);
+ history.addToHistory(targ,'SmokeTrace to '+targ);
start_trace();
}
history.addEventListener('request', history_action);
@@ -127,7 +127,7 @@ qx.Class.define('Tr.ui.ActionButton',
var initial_host = qx.client.History.getInstance().getState();
if (initial_host){
host.setValue(initial_host);
- history.addToHistory(initial_host,'SmokeTraceroute to '+initial_host);
+ history.addToHistory(initial_host,'SmokeTrace to '+initial_host);
// dispatch this task once all the initializations are done
qx.client.Timer.once(start_trace,this,0);
}