Please merge/sync mcollective from debian wheezy

[Dave Walker]

mcollective mcollective_1.2.1+dfsg is now in Debian wheezy. It would be good to rebase the Ubuntu package based on the Debian package (which is already based on the Ubuntu package).

However, a straight sync might not be appropriate as the delta is rather large. We need to determine if we can sync, or merge.

Thanks.

[Dave Walker (davewalker)]

Attaching debdiff of Ubuntu -> Debian. Tentatively assigning to Marc Cluet who has been closest to this package in Ubuntu, for evaluation.

Thanks.

[Marc Cluet (lynxman)]

This involves several steps

1. Testing that the activemq sync from debian wheezy works properly under precise
2. Evaluate debdiff and add merge (if necessary) with our package switching from rabbitmq to activemq while at it (up for discussion)

[Dave Walker (davewalker)]

@Marc, Should we just do a sync and resolve issues as they are discovered? Has there been any discussion regarding rabbitmq -> activemq switch?

[Marc Cluet (lynxman)]

Sync from debian testing

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "Sync from debian testing" of this bug report has been identified as being a patch in the form of a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. In the event that this is in fact not a patch you can resolve this situation by removing the tag 'patch' from the bug report and editing the attachment so that it is not flagged as a patch. Additionally, if you are member of the ubuntu-sponsors please also unsubscribe the team from this bug report.

[This is an automated message performed by a Launchpad user owned by Brian Murray. Please contact him regarding any issues with the action taken in this bug report.]

[Dave Walker (davewalker)]

Hi Marc,

Thanks for the debdiff. Great work.

I did have a couple of comments.

I'm not sure I agree that the debian/control diff of the Description fields is ideal, is this required? For example:
-Description: Marionette Collective clustering framework - server
+Description: build server orchestration or parallel job execution systems

debian/changelog: Could do with a more descriptive entry, it doesn't really describe what has changed or been dropped.

debian/mcollective-middleware.postinst: Calls the service command directly, it's going to be safer to do
- service activemq stop
- service activemq start
+ invoke-rc.d activemq stop || :
+ invoke-rc.d activemq start

Thanks!

[Marc Cluet (lynxman)]

After reviewing the suggestions here's a new debdiff :)

[Marc Cluet (lynxman)]

Final patch with all dependencies checked

[Dave Walker (davewalker)]

Hi Marc,

Thanks for the updated debdiff.. I raised in the previous comment that I couldn't see why were were deviating from Debian for the package descriptions, such as:
-Description: Marionette Collective clustering framework - server
+Description: build server orchestration or parallel job execution systems

Please can you also confirm why were are switching from rabbitmq -> activemq. I don't remember there being decision on this. activemq is in universe, and whilst this is ok as this package is in the same; it seems odd to switch from a dependency which is in main to one which is universe.

Thanks.

[Marc Cluet (lynxman)]

Hi Dave,

The deviated Descriptions should be okay in the last debdiff, I double checked them all, hope I didn't miss any

About the switch, activemq is recommended by mcollective upstream and debian also supports activemq for mcollective, we want to give the users the convenience to still use rabbitmq-stomp if they wish so but we're trying at the same time to get in line with the recommended ampq server.

[Dave Walker (davewalker)]

@Marc, is there a Debian bug about switching to activemq?

The debdiff in comment #8 still has the old descriptions.

Thanks.

[Launchpad Janitor (janitor)]

This bug was fixed in the package mcollective - 1.2.1+dfsg-2ubuntu1

---------------
mcollective (1.2.1+dfsg-2ubuntu1) precise; urgency=low

  * Merge from debian unstable, remaining changes (LP: #874981)
    - debian/control: Package mcollective-middleware allows the user
      to install mcollective + his AMPQ server of choice, we now
      choose activemq by default but support for rabbitmq-stomp is
      also integrated
    - debian/control: Fixed rabbitmq dependencies to rabbitmq-stomp
    - debian/mcollective.postinst: Added fix for mcollective server.cfg to
      avoid daemonize if running on system with upstart
 -- Marc Cluet <email address hidden> Wed, 9 Nov 2011 18:12:27 +0000