diff options
author | Dave Cottlehuber <dch@apache.org> | 2012-12-20 22:21:48 +0100 |
---|---|---|
committer | Dave Cottlehuber <dch@apache.org> | 2012-12-20 22:24:07 +0100 |
commit | 5ebfa8e4bce7322ae0d7b7d95f269425cdb9a46c (patch) | |
tree | a91a522121b250c14b94c8970709c6a7459c4a00 | |
parent | 42eca20f1fe2f602d7b801b03c744d777fa3165d (diff) | |
download | couchdb-1.2.1.tar.gz |
Update for release process1.2.1
- CHANGES and NEWS
- support GPG_ARGS in Makefile.am using fix from 6dba2e9
- update acinclude.m4.in with release version
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | acinclude.m4.in | 2 |
4 files changed, 2 insertions, 6 deletions
@@ -4,8 +4,6 @@ Apache CouchDB CHANGES Version 1.2.1 ------------- -This version has not been released yet. - HTTP Interface: * No longer rewrites the X-CouchDB-Requested-Path during recursive diff --git a/Makefile.am b/Makefile.am index 8e16baf62..87a8d9e03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,7 +140,7 @@ distcheck-hook: distsign: distcheck check @# @@ unpack archive and run diff -r to double check missing files @# @@ does automake have anything that does this? - gpg --armor --detach-sig --default-key 8FBFCFBF \ + gpg --armor --detach-sig $(GPG_ARGS) \ < $(top_srcdir)/$(distdir).tar.gz \ > $(top_srcdir)/$(distdir).tar.gz.asc md5sum $(top_srcdir)/$(distdir).tar.gz \ @@ -10,8 +10,6 @@ Each release section notes when backwards incompatible changes have been made. Version 1.2.1 ------------- -This version has not been released yet. - * Fix various bugs in the URL rewriter when recursion is involved. * Fix couchdb start script. * Futon: Disable buttons that aren't available for the logged-in user. diff --git a/acinclude.m4.in b/acinclude.m4.in index 19d51aca7..d9fab8f6d 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -18,7 +18,7 @@ m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB]) m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB]) m4_define([LOCAL_VERSION_MAJOR], [1]) m4_define([LOCAL_VERSION_MINOR], [2]) -m4_define([LOCAL_VERSION_REVISION], [0]) +m4_define([LOCAL_VERSION_REVISION], [1]) m4_define([LOCAL_VERSION_STAGE], []) m4_define([LOCAL_VERSION_RELEASE], []) m4_define([LOCAL_VERSION_PRIMARY], |