[bnd] 02/02: Fix FTBFS with OpenJDK7

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to annotated tag debian/1.50.0-2
in repository bnd.

commit 9f36ab4115583f01802fb20a87e42e8c4cd17ac0
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Dec 8 23:39:56 2011 +0000

    Fix FTBFS with OpenJDK7
---
 debian/ant.properties |  4 ++++
 debian/changelog      | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/debian/ant.properties b/debian/ant.properties
index d0f4a76..15c17a0 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -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
diff --git a/debian/changelog b/debian/changelog
index 20ea0eb..0da1eb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git