Merge ~nacc/ubuntu/+source/libcommons-cli-java:merge into ~ubuntu-server-dev/ubuntu/+source/libcommons-cli-java:ubuntu/devel
Proposed by
Nish Aravamudan
| Status: | Needs review |
|---|---|
| Proposed branch: | ~nacc/ubuntu/+source/libcommons-cli-java:merge |
| Merge into: | ~ubuntu-server-dev/ubuntu/+source/libcommons-cli-java:ubuntu/devel |
| Diff against target: |
164 lines (+66/-26) (has conflicts) 8 files modified
debian/build-classpath (+4/-0) debian/changelog (+23/-0) debian/control (+16/-6) debian/copyright (+11/-18) debian/maven.cleanIgnoreRules (+1/-0) debian/maven.ignoreRules (+8/-0) debian/maven.publishedRules (+1/-0) debian/rules (+2/-2) Conflict in debian/changelog |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Pending | ||
|
Review via email:
|
|||
Description of the change
libcommons-cli-java (1.3.1-3ubuntu1) xenial; urgency=medium
* Merge from Debian unstable. Remaining changes:
- d/p/*: Dropped, no longer required.
- d/*: Switch to using maven-ant-helper for package build.
James, I would have preferred moving to the same buildsystem as Debian (DH instead of CDBS) but I got stuck trying to understand how to migrate everything and it seemed easier to just keep our delta (for now) and look to fix it properly later. I am happy to send a new merge request if you can provide me some guidance on what exactly should be done to use maven-ant-helper with the updated Debian build changes. I got relatively far with it locally, but got stuck on a path issue, I think.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
