The following commit has been merged in the master branch:
commit db86b96005e30b01c4465d56d63e0fc265aa1625
Author: Miguel Landaeta <mig...@miguel.cc>
Date:   Thu Dec 8 18:41:13 2011 -0430

    Fix FTBFS with OpenJDK7

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..c1d99c1
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,4 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
diff --git a/debian/changelog b/debian/changelog
index a360886..792a8d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cobertura (1.9.4.1+dfsg-3) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * debian/control: Fixed typo in Vcs-Git field.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (LP: #888927):
+    - d/ant.properties: Set source/target to 1.5 for javac and javadoc 
+      ant tasks to ensure backwards compatibility and avoid Java 7 
+      encoding errors.
+    - d/rules: Use ant.properties when building. 
+
+ -- Miguel Landaeta <mig...@miguel.cc>  Thu, 08 Dec 2011 18:40:38 -0430
+
 cobertura (1.9.4.1+dfsg-2) unstable; urgency=low
 
   * Now Build-Depends on libservlet2.5-java and add a missing Depends
diff --git a/debian/rules b/debian/rules
index 5d9d40f..fe715ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_UPSTREAM_VERSION := \
        dh --with javahelper $@
 
 override_dh_auto_build:
-       ant dist
+       ant -propertyfile debian/ant.properties dist
        docbook-to-man debian/cobertura-check.sgml > cobertura-check.1
        docbook-to-man debian/cobertura-instrument.sgml > cobertura-instrument.1
        docbook-to-man debian/cobertura-merge.sgml > cobertura-merge.1

-- 
Debian package for Cobertura

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to