merge bug20976 into default

This commit is contained in:
Matthias Radestock 2009-06-16 07:12:59 +01:00
commit 2ba7e3fbe3
2 changed files with 4 additions and 2 deletions

View File

@ -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, []},

View File

@ -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