Ubuntu
activemq package

Merge lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge into lp://staging/ubuntu/precise/activemq

  1. Precise (12.04)
  2. sid-merge
  3. Merge into precise
Proposed by Aditya V
Status: Merged
Merge reported by: Stéphane Graber
Merged at revision: not available
Proposed branch: lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge
Merge into: lp://staging/ubuntu/precise/activemq
Diff against target: 17152 lines (+12/-8449)
14 files modified
.pc/CVE-2011-4605.diff/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (+0/-2389)
.pc/CVE-2011-4605.diff/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (+0/-1449)
.pc/activemq-admin.patch/assembly/src/release/bin/activemq-admin (+0/-155)
.pc/applied-patches (+0/-8)
.pc/disable_some_modules.diff/pom.xml (+0/-1320)
.pc/drop_derby_use.diff/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java (+0/-96)
.pc/exclude_geronimo_jca.diff/activemq-pool/pom.xml (+0/-104)
.pc/exclude_geronimo_jca.diff/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java (+0/-187)
.pc/exclude_spring_osgi.diff/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java (+0/-51)
.pc/init_debian_default_values.diff/assembly/src/release/bin/activemq (+0/-653)
.pc/javadoc_links.diff/activemq-core/pom.xml (+0/-705)
.pc/javadoc_links.diff/pom.xml (+0/-1328)
debian/changelog (+8/-0)
debian/libactivemq-java.poms (+4/-4)
To merge this branch: bzr merge lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge
Reviewer Review Type Date Requested Status
James Page Approve
Ubuntu branches Pending
Review via email: mp+114781@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-05-20.

Description of the change

I fixed the error that caused activemq not to start by merging the Debian Sid branch into this one. I've now filled out the SRU for bug 993249 which is why I'm resubmitting this.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote : Posted in a previous version of this proposal

Thanks for taking the time to prepare this merge proposal.

As Ubuntu 12.04 is now release this fix will need to go through the Stable Release Update process.

This consitutes a minimal change the the version that is already in Ubuntu 12.04 rather than a merge from Debian Testing.

See https://wiki.ubuntu.com/StableReleaseUpdates for more information.

review: Needs Fixing
Revision history for this message
James Page (james-page) wrote :

Hi Aditya

Thanks for re-proposing the merge for precise.

First of all, the reason this merge is so large is that you have proposed it with patches not applied; the official source packages for Ubuntu are stored in bzr with patches applied and the .pc folder under version control.

You can fix this on future merge proposals by "quilt push && bzr add .pc" - they reviewers will only see the diff, not all of the missing patches as well.

Secondly, for a merge the changlog entries for the Debian change and the Ubuntu merge should be separate; in your branch the merge and the Debian changelog entry for 5.5.0+dfsg-7 are combined which is not correct.

Lastly, I would not deal with this as a merge; its an SRU so should be minimal change only - I would cherry pick the fix that was applied in 5.5.0+dfsg-7 and create a new version (5.5.0+dfsg-6ubuntu1.1) targetted precise-proposed. The changelog entry needs to be suitably verbose explaining both the issue and how its been fixed inline with https://wiki.ubuntu.com/StableReleaseUpdates.

If you could re-proposed inline with my last comment I will be happy to upload for you.

Thanks

review: Needs Fixing
lp://staging/~kroq-gar78/ubuntu/precise/activemq/sid-merge updated
9. By Aditya V

debian/libactivemq-java.poms: added the options '--java-lib' to
certain lines so that the necessary files are included in the
package and activemq doesn't fail to start (LP: #993249)

Revision history for this message
James Page (james-page) wrote :

Aditya

Thanks for updating; I've uploaded with a minor tweak to the changelog entry to say where the fix originated from and explain exactly what --java-lib is doing; I also switched the target from 'precise' to 'precise-proposed'.

Thanks for your work on this fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: