diff options
author | Matthias Radestock <matthias@lshift.net> | 2009-06-16 07:14:55 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@lshift.net> | 2009-06-16 07:14:55 +0100 |
commit | 45ebf0c2d2a03ef6939ae412196ea0cb000ff251 (patch) | |
tree | dac48d1f9789984ca48d9d5dc6c56d13a97b8d42 | |
parent | 4ffb5337f7ed6baf270fb51a18669cdcef31a592 (diff) | |
parent | 1a29c4255e9f282fdd5fee7249d1bf1dbe8c18f5 (diff) | |
download | rabbitmq-server-45ebf0c2d2a03ef6939ae412196ea0cb000ff251.tar.gz |
merge bug20979 into default
-rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
-rw-r--r-- | packaging/debs/Debian/debian/control | 2 |
2 files changed, 3 insertions, 1 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 03f5e3b5..d4e2cd17 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -7,7 +7,7 @@ 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 |