summaryrefslogtreecommitdiff
path: root/packaging/debs
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonyg@lshift.net>2009-05-27 14:29:27 +0100
committerTony Garnock-Jones <tonyg@lshift.net>2009-05-27 14:29:27 +0100
commit21e007dae8bcf307fd6a20287e0774b647c2e519 (patch)
tree4cdb975b23bfacf2fb64089ec790f3ddb0df2ed4 /packaging/debs
parent3120cdcb7b8f903c7236c636578ddabeb50068fd (diff)
parent55132607808a435a4906f17e9ba0107f99ab2850 (diff)
downloadrabbitmq-server-git-21e007dae8bcf307fd6a20287e0774b647c2e519.tar.gz
merge v1_5 into default
Diffstat (limited to 'packaging/debs')
-rw-r--r--packaging/debs/Debian/debian/changelog6
-rw-r--r--packaging/debs/Debian/debian/control2
2 files changed, 7 insertions, 1 deletions
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index d1ccd3a0c2..7c5673f77b 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.5.5-1) hardy; urgency=low
+
+ * New Upstream Release
+
+ -- Matthias Radestock <matthias@lshift.net> Tue, 19 May 2009 09:57:54 +0100
+
rabbitmq-server (1.5.4-1) hardy; urgency=low
* New Upstream Release
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index b2b3ab0236..216360725d 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, adduser, logrotate, ${misc:Depends}
+Depends: erlang-nox, erlang-os-mon | 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