[pkg-java] r15511 - trunk/bnd/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-08 23:39:56 +0000 (Thu, 08 Dec 2011)
New Revision: 15511

Modified:
   trunk/bnd/debian/ant.properties
   trunk/bnd/debian/changelog
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/bnd/debian/ant.properties
===================================================================
--- trunk/bnd/debian/ant.properties	2011-12-08 22:59:33 UTC (rev 15510)
+++ trunk/bnd/debian/ant.properties	2011-12-08 23:39:56 UTC (rev 15511)
@@ -1 +1,5 @@
 javac.excludes=**/aQute/bnd/junit/*.java
+# 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/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2011-12-08 22:59:33 UTC (rev 15510)
+++ trunk/bnd/debian/changelog	2011-12-08 23:39:56 UTC (rev 15511)
@@ -1,3 +1,15 @@
+bnd (1.50.0-2) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (LP: #888926) (Closes: #651389):
+    - d/ant.properties: Set default source/target to 1.5 to ensure
+      backwards compatibility and avoid Java 7 encoding errors.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 21:41:18 -0430
+
 bnd (1.50.0-1) unstable; urgency=low
 
   * New upstream release.