diff --git a/docs/source/conf.py b/docs/source/conf.py index 88adba1..766d113 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -60,9 +60,9 @@ author = 'The openNDS Contributors' # built documents. # # The short X.Y version. -version = '9.7.0beta' +version = '9.7.0' # The full version, including alpha/beta/rc tags. -release = '9.7.0beta' +release = '9.7.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/linux_openwrt/opennds/Makefile b/linux_openwrt/opennds/Makefile index a79277e..7e7770a 100644 --- a/linux_openwrt/opennds/Makefile +++ b/linux_openwrt/opennds/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opennds PKG_FIXUP:=autoreconf -PKG_VERSION:=9.6.0 -PKG_RELEASE:=2 +PKG_VERSION:=9.7.0 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://codeload.github.com/opennds/opennds/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=opennds-$(PKG_VERSION).tar.gz diff --git a/notes/release_todos b/notes/release_todos index 780fd0a..4cdea66 100644 --- a/notes/release_todos +++ b/notes/release_todos @@ -14,9 +14,9 @@ When ready to do a release, do the following: 12. Commit and Push to origin 13. Github - Create Pull Request and Merge to master 14. Github proceed to "Draft New Release" -15. Github tag release as eg. v9.6.0 (remembering the leading "v"") - (or use git tag -a v9.6.0 -m "opennds release 9.6.0 " and git push --tags.) +15. Github tag release as eg. v9.7.0 (remembering the leading "v"") + (or use git tag -a v9.7.0 -m "opennds release 9.6.0 " and git push --tags.) 16. In your local repository, make a new branch called "stable" 17. Push branch "stable" to origin, overwriting the existing "stable". Note:Branch stable is the source for the readthedocs stable documentation at https://openndsdocs.readthedocs.io/en/stable/ -18. In Master, set version to eg -beta eg 9.6.1-beta in conf.h, conf.py, openwrt/Makefile +18. In Master, set version to eg -beta eg 9.7.1-beta in conf.h, conf.py, openwrt/Makefile diff --git a/src/conf.h b/src/conf.h index d2af2fb..22e7a76 100644 --- a/src/conf.h +++ b/src/conf.h @@ -30,7 +30,7 @@ #ifndef _CONF_H_ #define _CONF_H_ -#define VERSION "9.7.0beta" +#define VERSION "9.7.0" /* * Defines how many times should we try detecting the interface with the default route (in seconds).