[SCM] Debian package checker branch, master, updated. 2.5.10-162-gb233a13
The following commit has been merged in the master branch:
commit b233a13325700af94436feceb05f886708b715e1
Author: Niels Thykier <niels@thykier.net>
Date: Mon Sep 24 15:34:13 2012 +0200
t/tests/java-*: Set javac opt -source 1.4
On platforms using GCJ as Java (e.g. kFreeBSD), javadoc fails with
passed -source 1.5.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/tests/java-class-format/debian/debian/rules b/t/tests/java-class-format/debian/debian/rules
index 10d7678..0a65d77 100755
--- a/t/tests/java-class-format/debian/debian/rules
+++ b/t/tests/java-class-format/debian/debian/rules
@@ -3,7 +3,7 @@
dh $@ --with javahelper
override_jh_build:
- jh_build
+ jh_build --javacopts='-target 1.4' --javacopts='-source 1.4'
unzip test.jar
# Unknown class version
perl -i -pe 's/^(\xCA\xFE\xBA\xBE...)./$$1\x2A/' org/debian/lintian/TestA.class
diff --git a/t/tests/java-classpath/debian/debian/rules b/t/tests/java-classpath/debian/debian/rules
index 25e040d..17a2e14 100755
--- a/t/tests/java-classpath/debian/debian/rules
+++ b/t/tests/java-classpath/debian/debian/rules
@@ -4,4 +4,4 @@
dh $@ --with javahelper
override_jh_build:
- jh_build --javacopts='-target 1.5' --javacopts='-source 1.5'
+ jh_build --javacopts='-target 1.4' --javacopts='-source 1.4'
diff --git a/t/tests/java-jars/debian/debian/rules b/t/tests/java-jars/debian/debian/rules
index 6bef5a7..5af8965 100755
--- a/t/tests/java-jars/debian/debian/rules
+++ b/t/tests/java-jars/debian/debian/rules
@@ -3,7 +3,7 @@
dh $@ --with javahelper
override_jh_build:
- jh_build --javacopts='-target 1.5' --javacopts='-source 1.5'
+ jh_build --javacopts='-target 1.4' --javacopts='-source 1.4'
unzip testa.jar
zip -r codeless.jar META-INF/
zip -r manifestless.jar org/
--
Debian package checker
Reply to: