diff options
| author | Tobias Oetiker <tobi@oetiker.ch> | 2011-10-11 09:12:04 +0200 |
|---|---|---|
| committer | Tobias Oetiker <tobi@oetiker.ch> | 2011-10-11 09:12:04 +0200 |
| commit | 4b4dc3a97a0b77a12ac036b4a1985f083ae11cdb (patch) | |
| tree | f78b69aa91616eb9de40990bab7e5f0581c94cd4 | |
| parent | bbba546ca670562a0d2aa2dd5e98d61c2b0d516e (diff) | |
| download | smokeping-4b4dc3a97a0b77a12ac036b4a1985f083ae11cdb.tar.gz smokeping-4b4dc3a97a0b77a12ac036b4a1985f083ae11cdb.tar.xz | |
ready for 2.6.2
| -rw-r--r-- | CHANGES | 5 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | htdocs/Makefile.am | 7 | ||||
| -rwxr-xr-x | release-smokeping.sh | 11 |
5 files changed, 15 insertions, 13 deletions
@@ -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 @@ -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" |