lp:~hjd/ubuntu/wily/xmlgraphics-commons/debian-merged
- Get this branch:
- bzr branch lp:~hjd/ubuntu/wily/xmlgraphics-commons/debian-merged
Branch merges
Related bugs
Bug #1515358: Please merge xmlgraphics-commons from Debian | Wishlist | Fix Released |
Related blueprints
Branch information
- Owner:
- Hans Joachim Desserud
- Status:
- Merged
Recent revisions
- 17. By Hans Joachim Desserud
-
* Merge from Debian unstable. Remaining changes:
- d/control: Drop dependencies required for unit testing as they
include libmockito-java which would pull maven into main, disable unit
test execution. - 16. By James Page
-
* Merge from Debian unstable. Remaining changes:
- d/rules,control: Drop dependencies required for unit testing as they
include libmockito-java which would pull maven into main, disable unit
test execution. - 15. By James Page
-
* Merge from Debian unstable. Remaining changes:
- d/rules,control: Drop dependencies required for unit testing as they
include libmockito-java which would pull maven into main, disable unit
test execution. - 14. By James Page
-
d/rules,control: Drop dependencies required for unit testing as they
include libmockito-java which would pull maven into main, disable unit
test execution. - 13. By James Page
-
* Merge from Debian unstable. Remaining changes:
- d/rules: Enable testsuite execution.
- d/patches/disable- iccprofile- test.patch: Disable failing test
with openjdk-7 until resolved upstream.
* Dropped changes, included upstream:
- d/patches/java7-compat. patch.
- d/patches/enable- testsuite. patch: Disabled tests now functional.
* Dropped changes, included in Debian:
- debian/rules: commented in junit ant-junit to DEB_ANT_JARS to
enable test suite execution
- debian/rules: use /usr/lib/jvm/default- java for build.
- debian/control: Build-Depends: switched to default-jdk. - 12. By James Page
-
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888129):
- d/patches/java7-compat. patch: Cherry picked patch from upstream
VCS which removes the use of Sun Java 6 internal API's.
- d/patches/disable- iccprofile- test.patch: Disable failing test
with openjdk-7 until resolved upstream. - 11. By James Page
-
* Merge from Debian testing (LP: #922893). Remaining changes:
- debian/rules: commented in junit ant-junit to DEB_ANT_JARS to
enable test suite execution.
- debian/patches/ enable- testsuite. patch: patch in system libraries
and patch out failing tests (see patch for details of why).
- debian/rules: use /usr/lib/jvm/default- java for build.
- debian/control: Build-Depends: switched to default-jdk. - 10. By James Page
-
* MIR updates for Ubuntu (LP: #778216):
- debian/rules: commented in junit ant-junit to DEB_ANT_JARS to
enable test suite execution.
- debian/patches/ enable- testsuite. patch: patch in system libraries
and patch out failing tests (see patch for details of why).
- debian/control
+ Bumped Standards-Version: to 3.9.2, no changes.
+ Build-Depends: switched to default-jdk.
+ Removed library dependency on java-gcj-compat- headless |
java2-runtime- headless - no longer required by policy.
- debian/rules: use /usr/lib/jvm/default- java for build. - 8. By Gabriele Giacone
-
* Added Maven support
* Added VCS-* fields
* Standards-Version to 3.8.4
* Source format 3.0 (quilt)
* debhelper compat to 7
* d/copyright:
- converted to DEP5 format
- added debian/pom.xml section
* Removed Arnaud Vandyck from Uploaders
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)