You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/06/18 16:32:26 UTC
[07/41] git commit: updated refs/heads/1832-fix-empty-attachment-name
to ad774b6
Update for release process
- CHANGES and NEWS
- support GPG_ARGS in Makefile.am using fix from 6dba2e9
- update acinclude.m4.in with release version
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5ebfa8e4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5ebfa8e4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5ebfa8e4
Branch: refs/heads/1832-fix-empty-attachment-name
Commit: 5ebfa8e4bce7322ae0d7b7d95f269425cdb9a46c
Parents: 42eca20
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Thu Dec 20 22:21:48 2012 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Thu Dec 20 22:24:07 2012 +0100
----------------------------------------------------------------------
CHANGES | 2 --
Makefile.am | 2 +-
NEWS | 2 --
acinclude.m4.in | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5ebfa8e4/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index aec8a88..8a43648 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
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5ebfa8e4/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 8e16baf..87a8d9e 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 \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5ebfa8e4/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 6a8f100..4139a65 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.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5ebfa8e4/acinclude.m4.in
----------------------------------------------------------------------
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 19d51ac..d9fab8f 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],