diff --git a/README.md b/README.md index ca448c7c7..818fd4380 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.11-rc1 +Zcash 1.0.11 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index 129ddcde5..a94e0dbd7 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 11) -define(_CLIENT_VERSION_BUILD, 25) +define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 96675ed7b..1da00f690 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.11) stable; urgency=medium + + * 1.0.11 release. + + -- Zcash Company Tue, 15 Aug 2017 10:06:25 +0100 + zcash (1.0.11~rc1) stable; urgency=medium * 1.0.11-rc1 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 9851ba791..892de5287 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.11-rc1" +name: "zcash-1.0.11" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index 9c62b43d0..8d3010dc6 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,7 +1,7 @@ Zcash Contributors ================== -Jack Grigg (443) +Jack Grigg (445) Simon Liu (269) Sean Bowe (188) Daira Hopwood (102) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 3f08ec685..398f8feea 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11-rc1" "User Commands" +.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.11-rc1 +zcash-cli \- manual page for zcash-cli v1.0.11 .SH DESCRIPTION -Zcash RPC client version v1.0.11\-rc1 +Zcash RPC client version v1.0.11 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 425ec47e0..f40e4a345 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11-rc1" "User Commands" +.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.11-rc1 +zcash-tx \- manual page for zcash-tx v1.0.11 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.11\-rc1 +Zcash zcash\-tx utility version v1.0.11 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 10c8905a6..df1a35b14 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "August 2017" "zcashd v1.0.11-rc1" "User Commands" +.TH ZCASHD "1" "August 2017" "zcashd v1.0.11" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.11-rc1 +zcashd \- manual page for zcashd v1.0.11 .SH DESCRIPTION -Zcash Daemon version v1.0.11\-rc1 +Zcash Daemon version v1.0.11 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11\-rc1) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11) .HP \fB\-exportdir=\fR .IP diff --git a/doc/release-notes/release-notes-1.0.11.md b/doc/release-notes/release-notes-1.0.11.md new file mode 100644 index 000000000..7a36c0be6 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.11.md @@ -0,0 +1,7 @@ +Changelog +========= + +Jack Grigg (2): + make-release.py: Versioning changes for 1.0.11. + make-release.py: Updated manpages for 1.0.11. + diff --git a/src/clientversion.h b/src/clientversion.h index 483264a15..61813106f 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 11 -#define CLIENT_VERSION_BUILD 25 +#define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/deprecation.h b/src/deprecation.h index 685b21f3e..881e66196 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -6,7 +6,7 @@ #define ZCASH_DEPRECATION_H // Deprecation policy is 4th third-Tuesday after a release -static const int APPROX_RELEASE_HEIGHT = 159000; +static const int APPROX_RELEASE_HEIGHT = 167200; static const int WEEKS_UNTIL_DEPRECATION = 18; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);