You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2010/08/10 23:22:42 UTC
svn commit: r984215 - in /couchdb/branches/1.0.x: ./ etc/Makefile.am
etc/default/couchdb
Author: nslater
Date: Tue Aug 10 21:22:42 2010
New Revision: 984215
URL: http://svn.apache.org/viewvc?rev=984215&view=rev
Log:
backported r984214
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/etc/Makefile.am
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 21:22:42 2010
@@ -6,4 +6,4 @@
/couchdb/branches/list-iterator:782292-784593
/couchdb/branches/tail_header:775760-778477
/couchdb/tags/0.10.0:825400
-/couchdb/trunk:984170,984178
+/couchdb/trunk:984170,984178,984214
Modified: couchdb/branches/1.0.x/etc/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/etc/Makefile.am?rev=984215&r1=984214&r2=984215&view=diff
==============================================================================
--- couchdb/branches/1.0.x/etc/Makefile.am (original)
+++ couchdb/branches/1.0.x/etc/Makefile.am Tue Aug 10 21:22:42 2010
@@ -25,10 +25,15 @@ endif
nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
-EXTRA_DIST = default/couchdb
+EXTRA_DIST = \
+ default/couchdb \
+ windows/couchdb.iss.tpl \
+ windows/README.txt.tpl
if WINDOWS
-EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha
+EXTRA_DIST += \
+ windows/setup-couchdb-@version@.exe.md5 \
+ windows/setup-couchdb-@version@.exe.sha
endif
CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 21:22:42 2010
@@ -6,5 +6,5 @@
/couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
/couchdb/branches/tail_header/etc/default/couchdb:775760-778477
/couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:984170,984178
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440