The following commit has been merged in the master branch:
commit 64e5248c280b0bd7aa5c5a80b24cd9397f94ad12
Author: Rene Engelhard <[email protected]>
Date: Tue Apr 10 23:12:26 2012 +0200
disable junit tests on OpenJDK7-using archs, building fails
diff --git a/changelog b/changelog
index b5c9abe..b3aca64 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:3.5.2-3) UNRELEASED; urgency=low
* debian/rules:
- use gnutls for neon again
+ - disable junit tests on OpenJDK7-using archs, building
+ fails
- -- Rene Engelhard <[email protected]> Tue, 10 Apr 2012 10:35:48 +0200
+ -- Rene Engelhard <[email protected]> Tue, 10 Apr 2012 15:11:45 +0200
libreoffice (1:3.5.2-2) unstable; urgency=low
diff --git a/rules b/rules
index cbdccd2..15bfaf7 100755
--- a/rules
+++ b/rules
@@ -205,6 +205,9 @@ ifeq "$(ENABLE_JAVA)" "y"
else
ENABLE_JUNIT4=n
endif
+ ifeq "$(JAVA_MAINVER)" "7"
+ ENABLE_JUNIT4=n
+ endif
endif
else
RUN_MAKE_CHECK=n
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
