From 24a24abf75d6627c83a2c079fda47c6a924a5686 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Wed, 8 Mar 2017 12:32:59 -0800 Subject: [PATCH 1/5] Add -t to git fetch for release-notes.py --- zcutil/release-notes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py index bccabcaac..47f234906 100644 --- a/zcutil/release-notes.py +++ b/zcutil/release-notes.py @@ -71,7 +71,7 @@ def document_authors(): def generate_release_note(version, filename): print "Automatically generating release notes for {0} from git shortlog. Should review {1} for accuracy.".format(version, filename) # fetches latest tags, so that latest_tag will be correct - subprocess.Popen(['git fetch'], shell=True, stdout=subprocess.PIPE).communicate()[0] + subprocess.Popen(['git fetch -t'], shell=True, stdout=subprocess.PIPE).communicate()[0] latest_tag = subprocess.Popen(['git describe --abbrev=0'], shell=True, stdout=subprocess.PIPE).communicate()[0].strip() print "Previous release tag: ", latest_tag notes = subprocess.Popen(['git shortlog --no-merges {0}..HEAD'.format(latest_tag)], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE).communicate()[0] From 0fe4b85708f6370ea2042b8dca71f877e978bf55 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Wed, 8 Mar 2017 12:50:33 -0800 Subject: [PATCH 2/5] Update version to 1.0.7-1 --- README.md | 4 ++-- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2071a72b7..a1ff6e34e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Zcash 1.0.7 -=========== +Zcash 1.0.7-1 +============= What is Zcash? -------------- diff --git a/configure.ac b/configure.ac index 08e15a81e..05d82697f 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, 7) -define(_CLIENT_VERSION_BUILD, 50) +define(_CLIENT_VERSION_BUILD, 51) 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 0315b1ed2..6f7dc07c7 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.7" +name: "zcash-1.0.7-1" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index e8ef48b6b..5bd1f2760 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 7 -#define CLIENT_VERSION_BUILD 50 +#define CLIENT_VERSION_BUILD 51 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true From 82b6ec23db02657e57a214011898dfc16d6270ca Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Wed, 8 Mar 2017 12:51:15 -0800 Subject: [PATCH 3/5] Update auto-generated manpages to 1.0.7-1 --- doc/man/zcash-cli.1 | 2 +- doc/man/zcash-tx.1 | 2 +- doc/man/zcashd.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 4ab519088..1247efd4d 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -3,7 +3,7 @@ .SH NAME zcash-cli \- manual page for zcash-cli v1.0.7 .SH DESCRIPTION -Zcash RPC client version v1.0.7 +Zcash RPC client version v1.0.7-1 .SS "Usage:" .TP zcash\-cli [options] [params] diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 9d5bc48e5..b770fd342 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -3,7 +3,7 @@ .SH NAME zcash-tx \- manual page for zcash-tx v1.0.7 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.7 +Zcash zcash\-tx utility version v1.0.7-1 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index c2bb4f77e..9e0dae7ea 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -3,7 +3,7 @@ .SH NAME zcashd \- manual page for zcashd v1.0.7 .SH DESCRIPTION -Zcash Daemon version v1.0.7 +Zcash Daemon version v1.0.7-1 .SS "Usage:" .TP zcashd [options] From f0046397ca0f20f358585f6784bcc67cbf33ad41 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Wed, 8 Mar 2017 13:12:24 -0800 Subject: [PATCH 4/5] Add updated release notes for v1.0.7-1 --- doc/authors.md | 2 +- doc/release-notes/release-notes-1.0.7-1.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/release-notes-1.0.7-1.md diff --git a/doc/authors.md b/doc/authors.md index 9f6c9d45d..7036c4a9d 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -7,7 +7,7 @@ Sean Bowe (183) Taylor Hornby (65) Daira Hopwood (65) Jonas Schnelli (47) -Jay Graber (39) +Jay Graber (42) Kevin Gallagher (38) Wladimir J. van der Laan (30) Cory Fields (13) diff --git a/doc/release-notes/release-notes-1.0.7-1.md b/doc/release-notes/release-notes-1.0.7-1.md new file mode 100644 index 000000000..6474eb628 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.7-1.md @@ -0,0 +1,4 @@ +Jay Graber (3): + Add -t to git fetch for release-notes.py + Update version to 1.0.7-1 + Update auto-generated manpages to 1.0.7-1 From 0195a9fc0fa22562cc8eb343c3f6eb82d80f51b8 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Wed, 8 Mar 2017 13:52:44 -0800 Subject: [PATCH 5/5] Update debian package changelog for 1.0.7+1 (use + instead of - for debian versioning) --- contrib/debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index e4024633e..eb95b3ba3 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,6 +1,12 @@ +zcash (1.0.7+1) jessie; urgency=medium + + * 1.0.7-1 release. + + -- Zcash Company Wed, 08 Mar 2017 13:51:11 -0800 + zcash (1.0.7) jessie; urgency=medium - * 1.0.7 release. + * 1.0.7 release. -- Zcash Company Fri, 03 Mar 2017 20:55:04 -0800