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

4 files changed, 2 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index aec8a884f..8a4364835 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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 \
diff --git a/NEWS b/NEWS
index 6a8f100f8..4139a65dc 100644
--- a/NEWS
+++ b/NEWS
@@ -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],