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 2009/04/14 18:41:06 UTC

svn commit: r764873 - in /couchdb/branches/0.9.x: ./ README etc/default/couchdb

Author: nslater
Date: Tue Apr 14 16:41:05 2009
New Revision: 764873

URL: http://svn.apache.org/viewvc?rev=764873&view=rev
Log:
merged r761343 from trunk

Modified:
    couchdb/branches/0.9.x/   (props changed)
    couchdb/branches/0.9.x/README
    couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:41:05 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343

Modified: couchdb/branches/0.9.x/README
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/README?rev=764873&r1=764872&r2=764873&view=diff
==============================================================================
--- couchdb/branches/0.9.x/README (original)
+++ couchdb/branches/0.9.x/README Tue Apr 14 16:41:05 2009
@@ -69,8 +69,7 @@
 
 You can install the dependencies by running:
 
-    apt-get install build-essential erlang libicu38 libicu-dev libmozjs-dev \
-                    libcurl4-openssl-dev
+    apt-get install build-essential erlang libicu-dev libmozjs-dev libcurl4-openssl-dev
 
 If you get an error regarding the `libicu38` or `libicu-dev` be sure to check
 the version used by your distribution (using `apt-cache search libicu`) and

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:41:05 2009
@@ -1,4 +1,4 @@
 /couchdb/branches/design_resources/etc/default/couchdb:751716-751803
 /couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440