Package: xmlgraphics-commons
Version: 1.5-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* 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.
Jessie will be switching default-java to OpenJDK 7 fairly soon; I've
reported the test bug upstream as well (see the headers).
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500,
'raring-proposed'), (500, 'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8.0-21-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru xmlgraphics-commons-1.5/debian/changelog xmlgraphics-commons-1.5/debian/changelog
diff -Nru xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch
--- xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch 1970-01-01 01:00:00.000000000 +0100
+++ xmlgraphics-commons-1.5/debian/patches/disable-iccprofile-test.patch 2013-05-17 10:00:58.000000000 +0100
@@ -0,0 +1,36 @@
+Description: This test fails with openjdk-7 (and oracle java 7).
+ Skip for the time being until upstream resolve - see Bug.
+Author: James Page <james.p...@ubuntu.com>
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53328
+
+--- a/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
++++ b/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
+@@ -162,28 +162,6 @@ public class ImageLoaderTestCase extends
+ sessionContext.checkAllStreamsClosed();
+ }
+
+- public void testICCProfiles() throws Exception {
+- MyImageSessionContext sessionContext = createImageSessionContext();
+- List/* <ICC_Profile> */profiles = new ArrayList();
+-
+- runReaders(profiles, sessionContext, "iccTest.png", "image/png",
+- ImageFlavor.RAW_PNG);
+- runReaders(profiles, sessionContext, "iccTest.jpg", "image/jpeg",
+- ImageFlavor.RAW_JPEG);
+-
+- ICC_Profile first = (ICC_Profile) profiles.get(0);
+- byte[] firstData = first.getData();
+- for (int i = 1; i < profiles.size(); i++) {
+- ICC_Profile icc = (ICC_Profile) profiles.get(i);
+- byte[] data = icc.getData();
+- assertEquals("Embedded ICC Profiles are not the same size!",
+- firstData.length, data.length);
+- for (int j = 0; j < firstData.length; j++) {
+- assertEquals("Embedded ICC Profiles differ at index " + j,
+- firstData[j], data[j]);
+- }
+- }
+- }
+
+ private void runReaders(List profiles, ImageSessionContext isc, String uri,
+ String mime, ImageFlavor rawFlavor) throws Exception {
diff -Nru xmlgraphics-commons-1.5/debian/patches/series xmlgraphics-commons-1.5/debian/patches/series
--- xmlgraphics-commons-1.5/debian/patches/series 2012-10-31 20:08:21.000000000 +0000
+++ xmlgraphics-commons-1.5/debian/patches/series 2013-05-17 10:24:41.000000000 +0100
@@ -1,2 +1,3 @@
#xml-top-level.patch
#xml-rdf-resource.patch
+disable-iccprofile-test.patch
diff -Nru xmlgraphics-commons-1.5/debian/rules xmlgraphics-commons-1.5/debian/rules
--- xmlgraphics-commons-1.5/debian/rules 2012-11-03 14:02:59.000000000 +0000
+++ xmlgraphics-commons-1.5/debian/rules 2013-05-17 10:29:04.000000000 +0100
@@ -11,11 +11,15 @@
# all target, builds package and run test
override_dh_auto_build:
- #dh_auto_build -- -noinput -Dpwd=none all maven-artifacts
- dh_auto_build -- -noinput -Dpwd=none package maven-artifacts
+ # Link in required deps for testing
+ ln -sf /usr/share/java/commons-io.jar lib/
+ ln -sf /usr/share/java/commons-logging.jar lib/
+ dh_auto_build -- -noinput -Dpwd=none all maven-artifacts
-# remove tests for now until issue with DISPLAY is solved
-#override_dh_auto_test:
+override_dh_auto_clean:
+ # Drop any linked in deps for testing
+ rm -f lib/*.jar
+ dh_auto_clean
override_dh_install:
#mh_installpoms -plib$(PACKAGE)-java
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
