Merge ~nacc/ubuntu/+source/junit4:merge into ~ubuntu-server-dev/ubuntu/+source/junit4:ubuntu/devel
Status: | Needs review |
---|---|
Proposed branch: | ~nacc/ubuntu/+source/junit4:merge |
Merge into: | ~ubuntu-server-dev/ubuntu/+source/junit4:ubuntu/devel |
Diff against target: |
169 lines (+104/-2) (has conflicts) 6 files modified
debian/changelog (+41/-2) debian/control (+6/-0) debian/patches/Version.java.patch (+26/-0) debian/patches/privacy-breach-logo.patch (+25/-0) debian/patches/series (+5/-0) debian/rules (+1/-0) Conflict in debian/changelog Conflict in debian/control Conflict in debian/patches/series |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Pending | ||
Review via email: mp+286553@code.launchpad.net |
Description of the change
junit4 (4.12-4ubuntu1) xenial; urgency=medium
* Merge from Debian unstable. Remaining changes:
- d/*: Re-use 4.11-3 packaging to avoid the switch.
- d/build.
from 4.11 and adapt for new location and version.
- d/tweak-
test case due to differences in the way classes are loaded using
ant for the package build.
-- Nishanth Aravamudan <email address hidden> Wed, 17 Feb 2016 17:01:38 -0800
junit4 (4.12-4) unstable; urgency=medium
* Team upload.
* Override dh_install and execute jh_manifest after the installation took
place. This ensures that debian/
the jar file. Remove the old jh_manifest override instead.
Thanks to Rene Engelhard for the report. (Closes: #808736)
-- Markus Koschany <email address hidden> Tue, 22 Dec 2015 18:40:50 +0100
junit4 (4.12-3) unstable; urgency=medium
* Team upload.
* maven.ignoreRules: Ignore maven replacer plugin to prevent a FTBFS.
(Closes: #808494)
* Add Version.java.patch as a replacement for the replacer plugin.
* Do not remove Version.java in clean target.
* Switch from cdbs to dh sequencer.
* Vcs-Browser: Use https.
* Install all API documentation with junit4-doc.install.
* Add privacy-
-- Markus Koschany <email address hidden> Sun, 20 Dec 2015 21:57:58 +0100