diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-06-16 13:55:21 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-06-16 13:55:21 +0100 |
| commit | b159949a67ab7a188d649494a21edc2f2ce9bdb9 (patch) | |
| tree | 799235dc31c960ab2bf20c981e9c5137daf7f296 | |
| parent | 87590309f26e2cb0ed0076947720aab967110720 (diff) | |
| parent | d5c5eb0a8368c10e31f86a5158eb072ed5b1068c (diff) | |
| download | rabbitmq-server-b159949a67ab7a188d649494a21edc2f2ce9bdb9.tar.gz | |
merge bug20961 into default
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/control | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -69,7 +69,7 @@ clean: cleandb rm -f docs/*.[0-9].gz cleandb: stop-node - erl -mnesia dir '"$(RABBITMQ_MNESIA_DIR)"' -noshell -eval 'lists:foreach(fun file:delete/1, filelib:wildcard(mnesia:system_info(directory) ++ "/*")), halt().' + rm -rf $(RABBITMQ_MNESIA_DIR)/* ############ various tasks to interact with RabbitMQ ################### 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..d4e2cd17 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, 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 |