summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-06-16 07:14:55 +0100
committerMatthias Radestock <matthias@lshift.net>2009-06-16 07:14:55 +0100
commit7bb1f75fd47505f60178738bc8c16d84efdc17e5 (patch)
treedac48d1f9789984ca48d9d5dc6c56d13a97b8d42
parent2ba7e3fbe3183f647bd7e2eda5c0bea9fe20a4c5 (diff)
parent527a72bf8e3a4782edd3483c62e31a7d4ef168ee (diff)
downloadrabbitmq-server-git-7bb1f75fd47505f60178738bc8c16d84efdc17e5.tar.gz
merge bug20979 into default
-rw-r--r--Makefile2
-rw-r--r--packaging/debs/Debian/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4ff8573a23..367f153aa2 100644
--- a/Makefile
+++ b/Makefile
@@ -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/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 0af3ee61a3..d4e2cd1763 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -2,7 +2,7 @@ Source: rabbitmq-server
Section: net
Priority: extra
Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com>
-Build-Depends: cdbs, debhelper (>= 5), erlang-dev, erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), python-simplejson
+Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson
Standards-Version: 3.8.0
Package: rabbitmq-server