Created by Marc Cluet on 2012-06-20 and last modified on 2012-06-20
Get this branch:
bzr branch lp:~lynxman/ubuntu/quantal/rabbitmq-server/rabbitmqserver282merge
Only Marc Cluet can upload to this branch. If you are Marc Cluet please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Marc Cluet

Recent revisions

34. By Marc Cluet on 2012-06-20

* Merge from debian unstable, remaining changes (LP: #1004373)
  - Plugin packages rabbitmq-common rabbitmq-stomp
  - debian/conf: Added config files for plugin packages
  - debian/control: Added definitions for plugins
  - debian/rules: Added support for deb multipackage source
  - debian/patches/inets-plugins.patch: Added patch for inet
    dependent plugins
  - debian/rabbitmq-server.init: Used our own init script with
    additional changes
* Add version numbers to plugins
* New upstream release
* Add DM-Upload-Allowed flag to control file to allow Maintainer uploads

33. By Marc Cluet on 2012-05-31

Merging shared upstream rev into target branch.

32. By Andres Rodriguez on 2012-03-29

[ Dave Walker ]
* debian/rabbitmq-script-wrapper: Use start-stop-daemon instead of su
  to run the commands. This also allows rabbitmq to start on the
  installer if invoke-rc.d is used with --force. (LP: #966269)

[ Andres Rodriguez ]
* debian/rabbitmq-server.init: Use --no-wait in initctl emit command to
  not stall apt-get installations. (LP: #968124)

31. By Andres Rodriguez on 2012-03-27

debian/rabbitmq-server.init: emit 'rabbitmq-server-running' signal for
upstart as MAAS needs it.

30. By Marc Cluet on 2012-03-12

[ 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
  - 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).

29. By Clint Byrum on 2012-02-28

* New upstream release. (LP: #922600)
* Apply patch to include inets from the appropriate place. Fixes
* d/control: adding necessary build-deps for 2.7.1

28. By Thomas Herve on 2012-01-27

Use start-stop-daemon in the init script, removing usage of su
(LP: #913464)

27. By Chuck Short on 2011-11-13

Fix broken init script.

26. By Scott Moser on 2011-10-25

* close file handles of rabbitmq-server daemon in init script (LP: #878600)
* fix dpkg failure on purge (LP: #878597)

25. By Chuck Short on 2011-09-28

* Merge from debian unstable. Remaining changes:
  - symlink erlang libraries in a rabbit-common specific location.
  - Added explicit log line in startup_* and shutdown_* (LP: #838959)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.