couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject git commit: Update for 1.0.4
Date Thu, 20 Dec 2012 22:07:45 GMT
Updated Branches:
  refs/heads/1.0.x 9a580124c -> 514b7ef95


Update for 1.0.4


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/514b7ef9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/514b7ef9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/514b7ef9

Branch: refs/heads/1.0.x
Commit: 514b7ef95cf67a06f094d56b6ab86b4a770292bd
Parents: 9a58012
Author: Robert Newson <rnewson@apache.org>
Authored: Thu Dec 20 20:38:00 2012 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Dec 20 20:59:50 2012 +0000

----------------------------------------------------------------------
 Makefile.am     |    2 +-
 acinclude.m4.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/514b7ef9/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 6530287..2d0bbbe 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 43ECCEE1 \
+	gpg --armor --detach-sig --default-key DF3CEBA3 \
 	    < $(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/514b7ef9/acinclude.m4.in
----------------------------------------------------------------------
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 5a2fadd..3d3fabe 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], [0])
-m4_define([LOCAL_VERSION_REVISION], [3])
+m4_define([LOCAL_VERSION_REVISION], [4])
 m4_define([LOCAL_VERSION_STAGE], [])
 m4_define([LOCAL_VERSION_RELEASE], [])
 m4_define([LOCAL_VERSION_PRIMARY],


Mime
View raw message