make-release.py: Versioning changes for 1.0.11-rc1.

diff --git a/README.md b/README.md
index 9a05f1ba8b1fc586b620bb7448a33e0cd0bfd9e9..ca448c7c700e779ccbc7ee8b30a51c78d073de0a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Zcash 1.0.10-1
+Zcash 1.0.11-rc1
 =============
 
 What is Zcash?

diff --git a/configure.ac b/configure.ac
index 36a2059a4e71ef84e41440c43251e9d404773ca9..129ddcde5849c12487a00a7b63f57986ebe930dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 10)
-define(_CLIENT_VERSION_BUILD, 51)
+define(_CLIENT_VERSION_REVISION, 11)
+define(_CLIENT_VERSION_BUILD, 25)
 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/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index cc3dcd701f53c1e06e972b5e9c32f7c959afdcbb..9851ba791ffaaa813844f5ab1f2b1bb1d92157dc 100644 (file)
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-1.0.10-1"
+name: "zcash-1.0.11-rc1"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/src/clientversion.h b/src/clientversion.h
index f2bc38e4d84fc021a81f2d601f033cf19c04017e..483264a15f050cb19d59a0b042b073ca9c5a3291 100644 (file)
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -17,8 +17,8 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 10
-#define CLIENT_VERSION_BUILD 51
+#define CLIENT_VERSION_REVISION 11
+#define CLIENT_VERSION_BUILD 25
 
 //! 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 bfc70e72cd515995688d003202b6a42edd102a05..685b21f3e35ddda35cab21ccb5ea32f04c6c2fa5 100644 (file)
--- 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 = 137236;
+static const int APPROX_RELEASE_HEIGHT = 159000;
 static const int WEEKS_UNTIL_DEPRECATION = 18;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);