Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 46946 invoked from network); 14 Apr 2009 16:41:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2009 16:41:29 -0000 Received: (qmail 82700 invoked by uid 500); 14 Apr 2009 16:41:29 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 82629 invoked by uid 500); 14 Apr 2009 16:41:28 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 82620 invoked by uid 99); 14 Apr 2009 16:41:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:41:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:41:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2665823889C4; Tue, 14 Apr 2009 16:41:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764873 - in /couchdb/branches/0.9.x: ./ README etc/default/couchdb Date: Tue, 14 Apr 2009 16:41:06 -0000 To: commits@couchdb.apache.org From: nslater@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090414164106.2665823889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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