diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | acinclude.m4.in | 4 |
4 files changed, 3 insertions, 7 deletions
@@ -4,8 +4,6 @@ Apache CouchDB CHANGES Version 1.1.2 ------------- -This version has not been released yet. - HTTP Interface: * ETag of attachment changes only when the attachment changes, not diff --git a/Makefile.am b/Makefile.am index 2d0bbbe6b..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 DF3CEBA3 \ + 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.1.2 ------------- -This version has not been released yet. - * ETag of attachment changes only when the attachment changes, not the document. * Fix pull replication of documents with many revisions. diff --git a/acinclude.m4.in b/acinclude.m4.in index ca7b8fb1a..2d84c0091 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -19,8 +19,8 @@ m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB]) m4_define([LOCAL_VERSION_MAJOR], [1]) m4_define([LOCAL_VERSION_MINOR], [1]) m4_define([LOCAL_VERSION_REVISION], [2]) -m4_define([LOCAL_VERSION_STAGE], [a]) -m4_define([LOCAL_VERSION_RELEASE], [%release%]) +m4_define([LOCAL_VERSION_STAGE], []) +m4_define([LOCAL_VERSION_RELEASE], []) m4_define([LOCAL_VERSION_PRIMARY], [LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION]) m4_define([LOCAL_VERSION_SECONDARY], |