[Pkg-erlang-commits] r1261 - in couchdb/branches/r14a-compat/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-07-05 19:17:07 +0000 (Mon, 05 Jul 2010)
New Revision: 1261

Added:
   couchdb/branches/r14a-compat/debian/patches/couch_app.patch
Modified:
   couchdb/branches/r14a-compat/debian/changelog
Log:
[couchdb]
  * Added patch from upstream which fixes compatibiluty with Erlang R14A
    (closes: #587768, #587386).


Modified: couchdb/branches/r14a-compat/debian/changelog
===================================================================
--- couchdb/branches/r14a-compat/debian/changelog	2010-07-05 19:02:26 UTC (rev 1260)
+++ couchdb/branches/r14a-compat/debian/changelog	2010-07-05 19:17:07 UTC (rev 1261)
@@ -1,3 +1,10 @@
+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.

Added: couchdb/branches/r14a-compat/debian/patches/couch_app.patch
===================================================================
--- couchdb/branches/r14a-compat/debian/patches/couch_app.patch	                        (rev 0)
+++ couchdb/branches/r14a-compat/debian/patches/couch_app.patch	2010-07-05 19:17:07 UTC (rev 1261)
@@ -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} ->