Author: nslater
Date: Sat Apr 10 18:09:42 2010
New Revision: 932777
URL: http://svn.apache.org/viewvc?rev=932777&view=rev
Log:
backported fixes for 0.11.x to 0.10.x
Modified:
couchdb/branches/0.10.x/CHANGES
couchdb/branches/0.10.x/Makefile.am
couchdb/branches/0.10.x/etc/Makefile.am
Modified: couchdb/branches/0.10.x/CHANGES
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.10.x/CHANGES?rev=932777&r1=932776&r2=932777&view=diff
==============================================================================
--- couchdb/branches/0.10.x/CHANGES (original)
+++ couchdb/branches/0.10.x/CHANGES Sat Apr 10 18:09:42 2010
@@ -6,8 +6,12 @@ Version 0.10.2
Replicator
-* Avoid leaking file descriptors on automatic replication restarts.
-* Close security vulnerability CVE-2010-0009.
+ * Avoid leaking file descriptors on automatic replication restarts.
+ * Close security vulnerability CVE-2010-0009.
+
+Build and System Integration:
+
+ * Fixed distribution preparation for building on Mac OS X.
Version 0.10.1
--------------
Modified: couchdb/branches/0.10.x/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.10.x/Makefile.am?rev=932777&r1=932776&r2=932777&view=diff
==============================================================================
--- couchdb/branches/0.10.x/Makefile.am (original)
+++ couchdb/branches/0.10.x/Makefile.am Sat Apr 10 18:09:42 2010
@@ -74,6 +74,10 @@ local-clean: maintainer-clean
rm -f $(top_srcdir)/*.tar.gz.*
find $(top_srcdir) -name Makefile.in -exec rm {} \;
+dist-hook:
+ find $(top_srcdir) -type f -name "._*" -delete
+ find $(top_builddir) -type f -name "._*" -delete
+
distcheck-hook:
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
| grep -vEf license.skip; \
Modified: couchdb/branches/0.10.x/etc/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.10.x/etc/Makefile.am?rev=932777&r1=932776&r2=932777&view=diff
==============================================================================
--- couchdb/branches/0.10.x/etc/Makefile.am (original)
+++ couchdb/branches/0.10.x/etc/Makefile.am Sat Apr 10 18:09:42 2010
@@ -25,7 +25,7 @@ endif
nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
-EXTRA_DIST = $(init_sysconf_data)
+EXTRA_DIST = default/couchdb
CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)
