diff -Nru rabbitmq-server-2.7.1/debian/changelog rabbitmq-server-2.7.1/debian/changelog --- rabbitmq-server-2.7.1/debian/changelog 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/changelog 2012-03-12 09:52:21.000000000 +0000 @@ -1,3 +1,29 @@ +rabbitmq-server (2.7.1-0ubuntu2) precise; urgency=low + + [ Marc Cluet ] + * Add new rabbitmq-erlang-client and rabbitmq-stomp binary packages as + plugins are now part of rabbitmq-server core (LP: #948993): + - d/rules: Refactored to support multiple binary packages, enable + .d style configuration of rabbitmq for plugins. + - d/rabbitmq-stomp.[postinst|postrm|install]: Install configuration + for stomp, enable/disable stomp plugin and restart as required. + - d/rabbitmq-erlang-client.[postinst|postrm]: Enable/disable amqp_client + plugin and restart as required. + - d/rabbitmq-server.*: Renamed to support multiple binary packages. + - d/rabbitmq-server.dirs: Added rabbitmq.conf.d dir for .d configuration + files. + - d/rabbitmq-server.postrm.in: Avoid deletion of rabbitmq user on purge. + * Switched to source/format 3.0 (quilt): + - d/patches/inets-plugins.patch: Fixup path to httpd.hrl. + + [ James Page ] + * d/control: rabbitmq-server needs to Break/Replace + rabbitmq-plugins-common < 2.7.1. + * d/rabbitmq-server.links: Fixup link to point to 2.7.1 install. + * d/rabbitmq-server.init: Restore fix to use start-stop-daemon (LP: #913464). + + -- Marc Cluet Mon, 12 Mar 2012 08:58:42 +0000 + rabbitmq-server (2.7.1-0ubuntu1) precise; urgency=low * New upstream release. (LP: #922600) @@ -7,6 +33,13 @@ -- Clint Byrum Tue, 28 Feb 2012 09:55:49 -0800 +rabbitmq-server (2.6.1-1ubuntu4) precise; urgency=low + + * Use start-stop-daemon in the init script, removing usage of su + (LP: #913464) + + -- Thomas Hervé Fri, 27 Jan 2012 14:58:19 +0100 + rabbitmq-server (2.6.1-1ubuntu3) precise; urgency=low * Fix broken init script. diff -Nru rabbitmq-server-2.7.1/debian/conf/rabbitmq.conf.d/50_stomp rabbitmq-server-2.7.1/debian/conf/rabbitmq.conf.d/50_stomp --- rabbitmq-server-2.7.1/debian/conf/rabbitmq.conf.d/50_stomp 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/conf/rabbitmq.conf.d/50_stomp 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +RABBITMQ_SERVER_START_ARGS='-rabbitmq_stomp tcp_listeners [{"0.0.0.0",61613},{"0.0.0.0",6163}]' diff -Nru rabbitmq-server-2.7.1/debian/conf/rabbitmq-env.conf rabbitmq-server-2.7.1/debian/conf/rabbitmq-env.conf --- rabbitmq-server-2.7.1/debian/conf/rabbitmq-env.conf 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/conf/rabbitmq-env.conf 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,3 @@ +for CONFIGFILE in `ls /etc/rabbitmq/rabbitmq.conf.d |sort -r`; do + . /etc/rabbitmq/rabbitmq.conf.d/$CONFIGFILE +done diff -Nru rabbitmq-server-2.7.1/debian/control rabbitmq-server-2.7.1/debian/control --- rabbitmq-server-2.7.1/debian/control 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/control 2012-03-12 09:27:19.000000000 +0000 @@ -3,14 +3,34 @@ Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: RabbitMQ Team -Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson, xmlto, xsltproc, git, zip, unzip, erlang-asn1, erlang-inets -Standards-Version: 3.8.0 +Build-Depends: cdbs, debhelper (>= 5), quilt, erlang-dev, python-simplejson, xmlto, xsltproc, git, zip, unzip, erlang-asn1, erlang-inets +Standards-Version: 3.9.3 Package: rabbitmq-server Architecture: all +Breaks: rabbitmq-plugins-common (<< 2.7.1) +Replaces: rabbitmq-plugins-common (<< 2.7.1) Depends: erlang-nox (>= 1:12.b.3), 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 scalable implementation of an AMQP broker. Homepage: http://www.rabbitmq.com/ + +Package: rabbitmq-erlang-client +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, rabbitmq-server (= ${binary:Version}) +Description: Erlang client for RabbitMQ + This client offers both a networked version that uses standard TCP-based AMQP + framing and a direct client that uses native Erlang message passing to a + RabbitMQ broker. + +Package: rabbitmq-stomp +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, rabbitmq-server (>= 2.7.1), + rabbitmq-erlang-client (= ${binary:Version}) +Suggests: ruby +Description: A STOMP gateway for RabbitMQ + Gateway for exposing AMQP functionality via the STOMP protocol, as + implemented by many clients for various programming languages, and a few other + servers besides RabbitMQ. diff -Nru rabbitmq-server-2.7.1/debian/dirs rabbitmq-server-2.7.1/debian/dirs --- rabbitmq-server-2.7.1/debian/dirs 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -usr/lib/rabbitmq/bin -usr/lib/erlang/lib -usr/sbin -usr/share/man -var/lib/rabbitmq/mnesia -var/log/rabbitmq -etc/logrotate.d -etc/rabbitmq - diff -Nru rabbitmq-server-2.7.1/debian/links rabbitmq-server-2.7.1/debian/links --- rabbitmq-server-2.7.1/debian/links 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/rabbitmq/lib/rabbitmq_server-2.6.1 usr/lib/erlang/lib/rabbit_common diff -Nru rabbitmq-server-2.7.1/debian/patches/inets-plugins.patch rabbitmq-server-2.7.1/debian/patches/inets-plugins.patch --- rabbitmq-server-2.7.1/debian/patches/inets-plugins.patch 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/patches/inets-plugins.patch 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,18 @@ +--- rabbitmq-server-2.7.1.orig/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl ++++ rabbitmq-server-2.7.1/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl +@@ -88,14 +88,7 @@ + -module(rfc4627_jsonrpc_inets). + -include("rfc4627_jsonrpc.hrl"). + +-%% The path to httpd.hrl has changed in OTP R14A and newer. Our +-%% Makefile detects the change for us, and supplies a compile-time +-%% macro definition to allow us to adapt to the new path. +--ifdef(new_inets). +--include_lib("inets/src/http_server/httpd.hrl"). +--else. +--include_lib("inets/src/httpd.hrl"). +--endif. ++-include_lib("inets/include/httpd.hrl"). + + -export([do/1, load/2]). + diff -Nru rabbitmq-server-2.7.1/debian/patches/series rabbitmq-server-2.7.1/debian/patches/series --- rabbitmq-server-2.7.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/patches/series 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +inets-plugins.patch diff -Nru rabbitmq-server-2.7.1/debian/postinst rabbitmq-server-2.7.1/debian/postinst --- rabbitmq-server-2.7.1/debian/postinst 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -#!/bin/sh -# postinst script for rabbitmq -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -# create rabbitmq group -if ! getent group rabbitmq >/dev/null; then - addgroup --system rabbitmq -fi - -# create rabbitmq user -if ! getent passwd rabbitmq >/dev/null; then - adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq \ - --no-create-home --gecos "RabbitMQ messaging server" \ - --disabled-login rabbitmq -fi - -chown -R rabbitmq:rabbitmq /var/lib/rabbitmq -chown -R rabbitmq:rabbitmq /var/log/rabbitmq - -case "$1" in - configure) - if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ - [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then - mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru rabbitmq-server-2.7.1/debian/postrm.in rabbitmq-server-2.7.1/debian/postrm.in --- rabbitmq-server-2.7.1/debian/postrm.in 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/postrm.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -#!/bin/sh -# postrm script for rabbitmq -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -remove_plugin_traces() { - # Remove traces of plugins - rm -rf /var/lib/rabbitmq/plugins-scratch -} - -case "$1" in - purge) - rm -f /etc/default/rabbitmq - if [ -d /var/lib/rabbitmq ]; then - rm -r /var/lib/rabbitmq - fi - if [ -d /var/log/rabbitmq ]; then - rm -r /var/log/rabbitmq - fi - if [ -d /etc/rabbitmq ]; then - rm -r /etc/rabbitmq - fi - remove_plugin_traces - if getent passwd rabbitmq >/dev/null; then - # Stop epmd if run by the rabbitmq user - pkill -u rabbitmq epmd || : - # This fixes LP: #878597. This should be replaced by - # whatever fix is made in debian bug #646175 decides - pkill -u rabbitmq beam || : - - deluser rabbitmq - fi - if getent group rabbitmq >/dev/null; then - delgroup rabbitmq - fi - ;; - - remove|upgrade) - remove_plugin_traces - ;; - - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postinst rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postinst --- rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postinst 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postinst 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh -e + +/usr/lib/rabbitmq/bin/rabbitmq-plugins enable amqp_client +invoke-rc.d rabbitmq-server restart + +#DEBHELPER# diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postrm rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postrm --- rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postrm 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-erlang-client.postrm 2012-03-12 09:43:56.000000000 +0000 @@ -0,0 +1,48 @@ +#!/bin/sh +# postrm script for rabbitmq +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + purge) + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear|remove|upgrade) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + + +if [ -x /usr/lib/rabbitmq/bin/rabbitmq-plugins ]; then /usr/lib/rabbitmq/bin/rabbitmq-plugins disable amqp_client; fi +if ! /usr/sbin/invoke-rc.d rabbitmq-server restart ; then + RESTART_RESULT=$? + if [ "$RESTART_RESULT" != "100" ] ; then + exit $RESTART_RESULT + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-plugins-common.install rabbitmq-server-2.7.1/debian/rabbitmq-plugins-common.install --- rabbitmq-server-2.7.1/debian/rabbitmq-plugins-common.install 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-plugins-common.install 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +debian/conf/rabbitmq-env.conf etc/rabbitmq diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-server.dirs rabbitmq-server-2.7.1/debian/rabbitmq-server.dirs --- rabbitmq-server-2.7.1/debian/rabbitmq-server.dirs 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-server.dirs 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,9 @@ +usr/lib/rabbitmq/bin +usr/lib/erlang/lib +usr/sbin +usr/share/man +var/lib/rabbitmq/mnesia +var/log/rabbitmq +etc/logrotate.d +etc/rabbitmq +etc/rabbitmq/rabbitmq.conf.d diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-server.init rabbitmq-server-2.7.1/debian/rabbitmq-server.init --- rabbitmq-server-2.7.1/debian/rabbitmq-server.init 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/rabbitmq-server.init 2012-03-12 09:08:07.000000000 +0000 @@ -18,7 +18,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin NAME=rabbitmq-server -DAEMON=/usr/sbin/${NAME} +DAEMON=/usr/lib/rabbitmq/bin/${NAME} CONTROL=/usr/sbin/rabbitmqctl DESC=rabbitmq-server USER=rabbitmq @@ -56,8 +56,7 @@ RETVAL=0 ensure_pid_dir set +e - RABBITMQ_PID_FILE=$PID_FILE setsid $DAEMON > \ - ${INIT_LOG_DIR}/startup_log 2> "${INIT_LOG_DIR}/startup_err" 0<&- & + RABBITMQ_PID_FILE=$PID_FILE start-stop-daemon --pidfile=$PID_FILE --chuid rabbitmq --exec $DAEMON --background --start $CONTROL wait $PID_FILE >/dev/null 2>&1 RETVAL=$? set -e @@ -83,7 +82,7 @@ status_rabbitmq quiet if [ $RETVAL = 0 ] ; then set +e - $CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err + start-stop-daemon --pidfile=$PID_FILE --stop RETVAL=$? set -e if [ $RETVAL = 0 ] ; then diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-server.links rabbitmq-server-2.7.1/debian/rabbitmq-server.links --- rabbitmq-server-2.7.1/debian/rabbitmq-server.links 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-server.links 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/rabbitmq/lib/rabbitmq_server-2.7.1 usr/lib/erlang/lib/rabbit_common diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-server.postinst rabbitmq-server-2.7.1/debian/rabbitmq-server.postinst --- rabbitmq-server-2.7.1/debian/rabbitmq-server.postinst 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-server.postinst 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,60 @@ +#!/bin/sh +# postinst script for rabbitmq +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +# create rabbitmq group +if ! getent group rabbitmq >/dev/null; then + addgroup --system rabbitmq +fi + +# create rabbitmq user +if ! getent passwd rabbitmq >/dev/null; then + adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq \ + --no-create-home --gecos "RabbitMQ messaging server" \ + --disabled-login rabbitmq +fi + +chown -R rabbitmq:rabbitmq /var/lib/rabbitmq +chown -R rabbitmq:rabbitmq /var/log/rabbitmq + +case "$1" in + configure) + if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ + [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then + mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-server.postrm.in rabbitmq-server-2.7.1/debian/rabbitmq-server.postrm.in --- rabbitmq-server-2.7.1/debian/rabbitmq-server.postrm.in 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-server.postrm.in 2012-03-12 09:52:46.000000000 +0000 @@ -0,0 +1,61 @@ +#!/bin/sh +# postrm script for rabbitmq +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +remove_plugin_traces() { + # Remove traces of plugins + rm -rf /var/lib/rabbitmq/plugins-scratch +} + +case "$1" in + purge) + rm -f /etc/default/rabbitmq + if [ -d /var/lib/rabbitmq ]; then + rm -r /var/lib/rabbitmq + fi + if [ -d /var/log/rabbitmq ]; then + rm -r /var/log/rabbitmq + fi + if [ -d /etc/rabbitmq ]; then + rm -r /etc/rabbitmq + fi + remove_plugin_traces + ;; + + remove|upgrade) + remove_plugin_traces + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-stomp.install rabbitmq-server-2.7.1/debian/rabbitmq-stomp.install --- rabbitmq-server-2.7.1/debian/rabbitmq-stomp.install 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-stomp.install 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +debian/conf/rabbitmq.conf.d/50_stomp etc/rabbitmq/rabbitmq.conf.d diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postinst rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postinst --- rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postinst 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postinst 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh -e + +/usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_stomp +invoke-rc.d rabbitmq-server restart + +#DEBHELPER# diff -Nru rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postrm rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postrm --- rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postrm 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/rabbitmq-stomp.postrm 2012-03-12 09:43:11.000000000 +0000 @@ -0,0 +1,48 @@ +#!/bin/sh +# postrm script for rabbitmq +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + purge) + rm -f /etc/rabbitmq/rabbitmq.conf.d/50_stomp + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear|remove|upgrade) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +if [ -x /usr/lib/rabbitmq/bin/rabbitmq-plugins ]; then /usr/lib/rabbitmq/bin/rabbitmq-plugins disable rabbitmq_stomp; fi +if ! /usr/sbin/invoke-rc.d rabbitmq-server restart ; then + RESTART_RESULT=$? + if [ "$RESTART_RESULT" != "100" ] ; then + exit $RESTART_RESULT + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru rabbitmq-server-2.7.1/debian/rules rabbitmq-server-2.7.1/debian/rules --- rabbitmq-server-2.7.1/debian/rules 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/debian/rules 2012-03-12 08:58:39.000000000 +0000 @@ -3,19 +3,22 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk -RABBIT_LIB=$(DEB_DESTDIR)usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)/ -RABBIT_BIN=$(DEB_DESTDIR)usr/lib/rabbitmq/bin/ +MULTIPACKAGE_DEB_DESTDIR=debian/rabbitmq-server/ -DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) MAN_DIR=$(DEB_DESTDIR)usr/share/man/ +RABBIT_LIB=$(MULTIPACKAGE_DEB_DESTDIR)usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)/ +RABBIT_BIN=$(MULTIPACKAGE_DEB_DESTDIR)usr/lib/rabbitmq/bin/ + +DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) MAN_DIR=$(MULTIPACKAGE_DEB_DESTDIR)usr/share/man/ DEB_MAKE_CLEAN_TARGET:= distclean -DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/ +DOCDIR=$(MULTIPACKAGE_DEB_DESTDIR)usr/share/doc/rabbitmq-server/ install/rabbitmq-server:: mkdir -p $(DOCDIR) rm $(RABBIT_LIB)LICENSE* $(RABBIT_LIB)INSTALL* for script in rabbitmqctl rabbitmq-server; do \ - install -p -D -m 0755 debian/rabbitmq-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \ + install -p -D -m 0755 debian/rabbitmq-script-wrapper $(MULTIPACKAGE_DEB_DESTDIR)usr/sbin/$$script; \ done - sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' debian/postrm - install -p -D -m 0755 debian/rabbitmq-server.ocf $(DEB_DESTDIR)usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server + sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' debian/rabbitmq-server.postrm + install -p -D -m 0755 debian/rabbitmq-server.ocf $(MULTIPACKAGE_DEB_DESTDIR)usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server + install -p -m 0644 debian/conf/rabbitmq-env.conf $(MULTIPACKAGE_DEB_DESTDIR)etc/rabbitmq diff -Nru rabbitmq-server-2.7.1/debian/source/format rabbitmq-server-2.7.1/debian/source/format --- rabbitmq-server-2.7.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/source/format 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru rabbitmq-server-2.7.1/debian/source/options rabbitmq-server-2.7.1/debian/source/options --- rabbitmq-server-2.7.1/debian/source/options 1970-01-01 01:00:00.000000000 +0100 +++ rabbitmq-server-2.7.1/debian/source/options 2012-03-12 08:58:39.000000000 +0000 @@ -0,0 +1 @@ +single-debian-patch diff -Nru rabbitmq-server-2.7.1/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl rabbitmq-server-2.7.1/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl --- rabbitmq-server-2.7.1/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl 2012-03-12 10:19:49.000000000 +0000 +++ rabbitmq-server-2.7.1/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl 2011-12-16 12:24:15.000000000 +0000 @@ -88,7 +88,14 @@ -module(rfc4627_jsonrpc_inets). -include("rfc4627_jsonrpc.hrl"). --include_lib("inets/include/httpd.hrl"). +%% The path to httpd.hrl has changed in OTP R14A and newer. Our +%% Makefile detects the change for us, and supplies a compile-time +%% macro definition to allow us to adapt to the new path. +-ifdef(new_inets). +-include_lib("inets/src/http_server/httpd.hrl"). +-else. +-include_lib("inets/src/httpd.hrl"). +-endif. -export([do/1, load/2]).