ready for 2.6.2

5 files changed, 15 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index ebbb79d..3172757 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2011/10/11 -- released version 2.6.2
+
+* migrated to github.com/oetiker/SmokePing
+* added missing files from cropper tree
+
 2011/09/28 -- released version 2.6.1
 
 * improved install documentation
diff --git a/autogen.sh b/autogen.sh
index 1daf45c..89cbcc6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
-autoreconf --force --install --verbose --make
\ No newline at end of file
+autoreconf --force --install --verbose --make
+# end
diff --git a/configure.ac b/configure.ac
index ba1693a..81ea133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 #
 
 
-AC_INIT([smokeping],[2.6.1],[tobi@oetiker.ch])
+AC_INIT([smokeping],[2.6.2],[tobi@oetiker.ch])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(conftools)
 AC_CANONICAL_TARGET
diff --git a/htdocs/Makefile.am b/htdocs/Makefile.am
index 1398a1e..85fcbd3 100644
--- a/htdocs/Makefile.am
+++ b/htdocs/Makefile.am
@@ -16,10 +16,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 JS = cropper/smokeping-zoom.js cropper/lib/unittest.js cropper/lib/slider.js cropper/lib/controls.js \
-     cropper/lib/sound.js cropper/lib/dragdrop.js \
-     cropper/lib/prototype.js cropper/lib/effects.js \
-     cropper/lib/builder.js cropper/lib/scriptaculous.js \
-     cropper/cropper.uncompressed.js cropper/cropper.js
+     cropper/lib/sound.js cropper/lib/dragdrop.js cropper/lib/prototype.js cropper/lib/effects.js \
+     cropper/lib/builder.js cropper/lib/scriptaculous.js  cropper/marqueeVert.gif cropper/cropper.uncompressed.js \
+     cropper/licence.txt cropper/marqueeHoriz.gif cropper/cropper.js cropper/cropper.css
 
 EXTRA_DIST = $(JS)
 
diff --git a/release-smokeping.sh b/release-smokeping.sh
index c3934bc..e0169b9 100755
--- a/release-smokeping.sh
+++ b/release-smokeping.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 set -e
-[ `svn status -q | wc -l` -gt 0 ] && echo "ERROR: commit all changes before release" && exit 1
-cd /tmp
-svn export svn://svn.oetiker.ch/smokeping/trunk/software smokeping-$$
-cd smokeping-$$
+[ `git status -s | wc -l` -gt 0 ] && echo "ERROR: commit all changes before release" && exit 1
 VERSION=`perl -n -e 'm/\QAC_INIT([smokeping],[\E(.+?)\Q]\E/ && print $1' configure.ac`
 mkdir conftools
 aclocal
@@ -16,7 +13,7 @@ make dist
 echo READY TO SYNC ?
 read XXX
 scp CHANGES smokeping-$VERSION.tar.gz oposs@james:public_html/smokeping/pub
-cd /tmp
-rm -fr smokeping-$$*
-svn copy -m "tagging version $VERSION" svn://svn.oetiker.ch/smokeping/trunk/software svn://svn.oetiker.ch/smokeping/tags/$VERSION
+rm -fr /tmp/smokeping-$$-build
+git tag $VERSION
+echo "run 'git push;git push --tags' to sync github"