Merge ~nacc/ubuntu/+source/bcel:merge into ~ubuntu-server-dev/ubuntu/+source/bcel:ubuntu/devel

Proposed by Nish Aravamudan
Status: Needs review
Proposed branch: ~nacc/ubuntu/+source/bcel:merge
Merge into: ~ubuntu-server-dev/ubuntu/+source/bcel:ubuntu/devel
Diff against target: 44 lines (+24/-0) (has conflicts)
2 files modified
debian/changelog (+18/-0)
debian/control (+6/-0)
Conflict in debian/changelog
Conflict in debian/control
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+286546@code.qastaging.launchpad.net

Description of the change

bcel (6.0~rc3-2ubuntu1) xenial; urgency=medium

  * Merge from Debian. Remaining changes:
    - Switch to using maven-ant-helper for build, avoiding inclusion of
      Maven in Ubuntu main.

 -- Nishanth Aravamudan <email address hidden> Wed, 17 Feb 2016 15:37:17 -0800

To post a comment you must log in.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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