[xmlgraphics-commons] 32/47: Prepare 1.5-3 upload

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository xmlgraphics-commons.

commit bee694a11648965e7eb1dbe18c4762ef23f1d64a
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed May 29 12:35:26 2013 +0000

    Prepare 1.5-3 upload
---
 debian/changelog                             |  8 +++++++
 debian/patches/disable-iccprofile-test.patch | 36 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 | 12 ++++++----
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ae38bb..e3f389a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xmlgraphics-commons (1.5-3) unstable; urgency=low
+
+  * Fix lintian error (doc-base-file-references-missing-file)
+  * Enable testsuite + disable test which is incompat with openjdk-7.
+    Thanks to James Page. Closes: #708616
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 29 May 2013 14:34:25 +0200
+
 xmlgraphics-commons (1.5-2) unstable; urgency=low
 
   * Upload to sid
diff --git a/debian/patches/disable-iccprofile-test.patch b/debian/patches/disable-iccprofile-test.patch
new file mode 100644
index 0000000..8dac586
--- /dev/null
+++ b/debian/patches/disable-iccprofile-test.patch
@@ -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.page at 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 --git a/debian/patches/series b/debian/patches/series
index f968cbf..6cfedbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #xml-top-level.patch
 #xml-rdf-resource.patch
+disable-iccprofile-test.patch
diff --git a/debian/rules b/debian/rules
index e84d4d4..c350ed8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,15 @@ VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f
 
 # 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xmlgraphics-commons.git