From fcf824e9f10e3a8dd34b4431d1a8686a5fb402f1 Mon Sep 17 00:00:00 2001
From: Ariel Gabizon <ariel.gabizon@gmail.com>
Date: Tue, 1 Aug 2017 17:11:57 +0200
Subject: [PATCH] make-release.py: Versioning changes for 1.0.11-rc1.

---
 README.md                                   | 2 +-
 configure.ac                                | 4 ++--
 contrib/gitian-descriptors/gitian-linux.yml | 2 +-
 src/clientversion.h                         | 4 ++--
 src/deprecation.h                           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 9a05f1ba8b1..ca448c7c700 100644
--- 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 36a2059a4e7..129ddcde584 100644
--- 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 cc3dcd701f5..9851ba791ff 100644
--- 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 f2bc38e4d84..483264a15f0 100644
--- 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 bfc70e72cd5..685b21f3e35 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 = 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);