[easyconf] 07/28: Fix FTBFS with OpenJDK7

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository easyconf.

commit d7d144e6f34ec1dbf395f8c82ff5118ef9b7ab91
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Dec 14 00:57:41 2011 +0000

    Fix FTBFS with OpenJDK7
---
 debian/ant.properties |  5 +++++
 debian/changelog      | 14 ++++++++++++++
 debian/control        |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 665a415..67d9480 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -5,3 +5,8 @@ libdir=target/
 classesdir=target/classes
 testclassesdir=target/test
 testreportdir=target/testreports
+
+# 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 a34f559..3c6dca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+easyconf (0.9.5-3) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Fix Vcs-Svn URL.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888933) (Closes: #651407):
+    - 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. 
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 13 Dec 2011 20:14:27 -0430
+
 easyconf (0.9.5-2) unstable; urgency=low
 
   * d/control: Bump Standards-Version to 3.9.2: no changes needed.
diff --git a/debian/control b/debian/control
index 3c490f5..20d1e7f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: ant,
                maven-repo-helper
 Standards-Version: 3.9.2
 Homepage: http://easyconf.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/easyconf/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/easyconf/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easyconf/
 
 Package: libeasyconf-java

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