couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject git commit: Update for release process
Date Fri, 21 Dec 2012 01:43:48 GMT
Updated Branches:
  refs/heads/1.1.x b07e65f52 -> 306a6eb44


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/306a6eb4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/306a6eb4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/306a6eb4

Branch: refs/heads/1.1.x
Commit: 306a6eb4405de878313b46ef026a6089503b693a
Parents: b07e65f
Author: Dave Cottlehuber <dch@apache.org>
Authored: Thu Dec 20 21:46:57 2012 +0100
Committer: Dave Cottlehuber <dch@apache.org>
Committed: Thu Dec 20 22:23:45 2012 +0100

----------------------------------------------------------------------
 CHANGES         |    2 --
 Makefile.am     |    2 +-
 NEWS            |    2 --
 acinclude.m4.in |    4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/306a6eb4/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f50390e..1af0ec4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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

http://git-wip-us.apache.org/repos/asf/couchdb/blob/306a6eb4/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 2d0bbbe..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 DF3CEBA3 \
+	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/306a6eb4/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index acb9721..050ac2a 100644
--- a/NEWS
+++ b/NEWS
@@ -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.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/306a6eb4/acinclude.m4.in
----------------------------------------------------------------------
diff --git a/acinclude.m4.in b/acinclude.m4.in
index ca7b8fb..2d84c00 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],


Mime
View raw message