couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r820162 - in /couchdb/trunk: ./ Makefile.am configure.ac etc/default/couchdb license.skip src/Makefile.am
Date Wed, 30 Sep 2009 03:13:33 GMT
Author: davisp
Date: Wed Sep 30 03:13:31 2009
New Revision: 820162

URL: http://svn.apache.org/viewvc?rev=820162&view=rev
Log:
Port Noah's bugfixes to trunk.


Modified:
    couchdb/trunk/   (props changed)
    couchdb/trunk/Makefile.am
    couchdb/trunk/configure.ac
    couchdb/trunk/etc/default/couchdb   (props changed)
    couchdb/trunk/license.skip
    couchdb/trunk/src/Makefile.am

Propchange: couchdb/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 30 03:13:31 2009
@@ -1,3 +1,4 @@
+/couchdb/branches/0.10.x:820161
 /couchdb/branches/0.9.x:775634
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015

Modified: couchdb/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/Makefile.am?rev=820162&r1=820161&r2=820162&view=diff
==============================================================================
--- couchdb/trunk/Makefile.am (original)
+++ couchdb/trunk/Makefile.am Wed Sep 30 03:13:31 2009
@@ -10,7 +10,7 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-SUBDIRS = bin etc src/couchdb src/erlang-oauth src/etap src/ibrowse src/mochiweb share test
var utils
+SUBDIRS = bin etc src share test var utils
 
 localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz
 
@@ -66,6 +66,7 @@
 	rm -f $(top_srcdir)/aclocal.m4
 	rm -f $(top_srcdir)/config.h.in
 	rm -f $(top_srcdir)/configure
+	rm -f $(top_srcdir)/test/etap/temp.*
 	rm -f $(top_srcdir)/*.tar.gz
 	rm -f $(top_srcdir)/*.tar.gz.*
 	rm -fr $(top_srcdir)/tmp

Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=820162&r1=820161&r2=820162&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Wed Sep 30 03:13:31 2009
@@ -150,7 +150,6 @@
     ICU_LOCAL_BIN=
 ])
 
-
 AC_SUBST(ICU_CONFIG)
 AC_SUBST(ICU_LOCAL_CFLAGS)
 AC_SUBST(ICU_LOCAL_LDFLAGS)
@@ -342,6 +341,7 @@
 AC_CONFIG_FILES([etc/logrotate.d/Makefile])
 AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([share/Makefile])
+AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
 AC_CONFIG_FILES([src/couchdb/Makefile])
 AC_CONFIG_FILES([src/couchdb/priv/Makefile])

Propchange: couchdb/trunk/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 30 03:13:31 2009
@@ -1,3 +1,4 @@
+/couchdb/branches/0.10.x/etc/default/couchdb:820161
 /couchdb/branches/0.9.x/etc/default/couchdb:775634
 /couchdb/branches/design_resources/etc/default/couchdb:751716-751803
 /couchdb/branches/form/etc/default/couchdb:729440-730015

Modified: couchdb/trunk/license.skip
URL: http://svn.apache.org/viewvc/couchdb/trunk/license.skip?rev=820162&r1=820161&r2=820162&view=diff
==============================================================================
--- couchdb/trunk/license.skip (original)
+++ couchdb/trunk/license.skip Wed Sep 30 03:13:31 2009
@@ -50,6 +50,8 @@
 ^share/www/script/json2.js
 ^share/www/script/sha1.js
 ^share/www/script/test/lorem*
+^src/Makefile
+^src/Makefile.in
 ^src/couchdb/*.beam
 ^src/couchdb/couch.app.tpl.in
 ^src/couchdb/.deps/*

Modified: couchdb/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/Makefile.am?rev=820162&r1=820161&r2=820162&view=diff
==============================================================================
--- couchdb/trunk/src/Makefile.am (original)
+++ couchdb/trunk/src/Makefile.am Wed Sep 30 03:13:31 2009
@@ -10,4 +10,4 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-## This file intentionally left blank.
+SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb



Mime
View raw message