summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-12 14:57:13 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-12 14:57:13 +0100
commit7539b2624c1620e4af398e6b15e7fb87069aa7dd (patch)
tree81f5834496456aa34b1314c68cd1547a2fad1d41
parentc54549506c2086b09bf9831455d410c86a4baf65 (diff)
downloadrabbitmq-server-7539b2624c1620e4af398e6b15e7fb87069aa7dd.tar.gz
Altered dependencies and added comment to the appbug20976
-rw-r--r--ebin/rabbit_app.in2
-rw-r--r--packaging/debs/Debian/debian/control4
2 files changed, 4 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 5be07492..8e1c890e 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -11,6 +11,8 @@
rabbit_sup,
rabbit_tcp_client_sup]},
{applications, [kernel, stdlib, sasl, mnesia, os_mon]},
+%% we also depend on ssl but it shouldn't be in here as we don't
+%% actually want to start it
{mod, {rabbit, []}},
{env, [{tcp_listeners, [{"0.0.0.0", 5672}]},
{extra_startup_steps, []},
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 21636072..0af3ee61 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -2,12 +2,12 @@ Source: rabbitmq-server
Section: net
Priority: extra
Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com>
-Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson
+Build-Depends: cdbs, debhelper (>= 5), erlang-dev, erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), python-simplejson
Standards-Version: 3.8.0
Package: rabbitmq-server
Architecture: all
-Depends: erlang-nox, erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
+Depends: erlang-base | erlang-base-hipe, erlang-ssl | erlang-nox (<< 1:13.b-dfsg1-1), erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
Description: An AMQP server written in Erlang
RabbitMQ is an implementation of AMQP, the emerging standard for high
performance enterprise messaging. The RabbitMQ server is a robust and