summaryrefslogtreecommitdiff
path: root/packaging/debs
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-05-09 16:03:24 +0100
committerTim Watson <tim@rabbitmq.com>2013-05-09 16:03:24 +0100
commit03c61eaa7b23fe4c5aa902504715236bc4abbb64 (patch)
tree54cd750becbb91ed6c9f0c041a3e04364a67daca /packaging/debs
parent08877efa78ca44cb0324d1d4242e01d4dab92933 (diff)
parentb365a806570224761307a3bdd25b1417d2746ce1 (diff)
downloadrabbitmq-server-git-03c61eaa7b23fe4c5aa902504715236bc4abbb64.tar.gz
merge default into bug25537
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 aed68b96a6..fe5310c855 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.1.0-1) unstable; urgency=low
+
+ * New Upstream Release
+
+ -- Simon MacMullen <simon@rabbitmq.com> Wed, 01 May 2013 11:57:58 +0100
+
rabbitmq-server (3.0.1-1) unstable; urgency=low
* New Upstream Release
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index d4526d877d..3a15c4b65d 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Package: rabbitmq-server
Architecture: all
-Depends: erlang-nox (>= 1:12.b.3), adduser, logrotate, ${misc:Depends}
+Depends: erlang-nox (>= 1:12.b.3) | esl-erlang, adduser, logrotate, ${misc:Depends}
Description: 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