[commons-csv] 23/35: 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 commons-csv.

commit d598433d27ac10f9d4a6d3301db680b5d6bed208
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Dec 10 02:25:57 2011 +0000

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

diff --git a/debian/ant.properties b/debian/ant.properties
index 255d6e8..2013122 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -7,3 +7,8 @@ javac.verbose=yes
 #build.compiler=gcj
 compile.debug=on
 compile.optimize=on
+
+# 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 c711fbf..9103f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
 commons-csv (0.1-SNAPSHOT+svn678580-3) UNRELEASED; urgency=low
 
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Switch to source format 3.0 (quilt).
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888929) (Closes: #651401): 
+    - 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.
+
+  [ Jan-Pascal van Best ]
   * Removed Jan-Pascal from Uploaders
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 16 Aug 2011 17:56:13 +0200
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 09 Dec 2011 21:42:38 -0430
 
 commons-csv (0.1-SNAPSHOT+svn678580-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d6fdb7c..20311b7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Koch <konqueror at gmx.de>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), cdbs (>=0.4.48), default-jdk,
  ant-optional (>= 1.6.5), junit (>= 3.8.1)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-csv
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-csv
 Homepage: http://commons.apache.org/sandbox/csv/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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