[Pkg-erlang-commits] r1263 - in couchdb/trunk: . debian debian/patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-07-05 19:27:35 +0000 (Mon, 05 Jul 2010)
New Revision: 1263

Added:
   couchdb/trunk/debian/patches/couch_app.patch
Modified:
   couchdb/trunk/
   couchdb/trunk/debian/changelog
Log:
[couchdb]
  * Merged changes from R14A compatibility branch.



Property changes on: couchdb/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /couchdb/branches/r14a-compat:1261

Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog	2010-07-05 19:22:44 UTC (rev 1262)
+++ couchdb/trunk/debian/changelog	2010-07-05 19:27:35 UTC (rev 1263)
@@ -1,4 +1,4 @@
-couchdb (0.11.0-2) UNRELEASED; urgency=low
+couchdb (0.11.0-3) UNRELEASED; urgency=low
 
   [ Sam Bisbee ]
   * Updated debian/control, removing mawk as a dependency per
@@ -14,6 +14,13 @@
 
  -- Elliot Murphy <elliot at ubuntu.com>  Wed, 23 Jun 2010 00:33:38 -0400
 
+couchdb (0.11.0-2) unstable; urgency=low
+
+  * Added patch from upstream which fixes compatibiluty with Erlang R14A
+    (closes: #587768, #587386).
+
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 05 Jul 2010 23:04:45 +0400
+
 couchdb (0.11.0-1) unstable; urgency=medium (security fixes)
 
   * New upstream release, including security fix for CVE-2010-00009.

Copied: couchdb/trunk/debian/patches/couch_app.patch (from rev 1261, couchdb/branches/r14a-compat/debian/patches/couch_app.patch)
===================================================================
--- couchdb/trunk/debian/patches/couch_app.patch	                        (rev 0)
+++ couchdb/trunk/debian/patches/couch_app.patch	2010-07-05 19:27:35 UTC (rev 1263)
@@ -0,0 +1,11 @@
+--- couchdb-0.11.0.orig/src/couchdb/couch_app.erl
++++ couchdb-0.11.0/src/couchdb/couch_app.erl
+@@ -20,7 +20,7 @@
+ 
+ start(_Type, DefaultIniFiles) ->
+     IniFiles = get_ini_files(DefaultIniFiles),
+-    case start_apps([crypto, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
++    case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
+     ok ->
+         couch_server_sup:start_link(IniFiles);
+     {error, Reason} ->