[pkg-java] r15510 - trunk/httpunit/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-08 22:59:33 +0000 (Thu, 08 Dec 2011)
New Revision: 15510

Added:
   trunk/httpunit/debian/ant.properties
Modified:
   trunk/httpunit/debian/changelog
   trunk/httpunit/debian/rules
Log:
Fix FTBFS with OpenJDK7

Added: trunk/httpunit/debian/ant.properties
===================================================================
--- trunk/httpunit/debian/ant.properties	                        (rev 0)
+++ trunk/httpunit/debian/ant.properties	2011-12-08 22:59:33 UTC (rev 15510)
@@ -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

Modified: trunk/httpunit/debian/changelog
===================================================================
--- trunk/httpunit/debian/changelog	2011-12-08 16:02:15 UTC (rev 15509)
+++ trunk/httpunit/debian/changelog	2011-12-08 22:59:33 UTC (rev 15510)
@@ -1,3 +1,14 @@
+httpunit (1.7+dfsg-9) UNRELEASED; urgency=low
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888940) (Closes: #651419):
+    - d/ant.properties: Specify source/target as 1.5 for javac and
+      javadoc ant tasks to ensure backwards compatibility and work
+      around Java 7 encoding errors.
+    - d/rules: Use ant.properties.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 18:33:30 -0430
+
 httpunit (1.7+dfsg-8) unstable; urgency=low
 
   * Fixup XML parsing with correct JAX-P 1.4 API's:

Modified: trunk/httpunit/debian/rules
===================================================================
--- trunk/httpunit/debian/rules	2011-12-08 16:02:15 UTC (rev 15509)
+++ trunk/httpunit/debian/rules	2011-12-08 22:59:33 UTC (rev 15510)
@@ -11,7 +11,7 @@
 	rm -f doc/tutorial/task1.zip
 
 override_dh_auto_build:
-	ant dist
+	ant -propertyfile debian/ant.properties dist
 
 get-orig-source:
 	sh -e debian/orig-tar.sh