[pkg-java] r15522 - in trunk/commons-csv/debian: . source

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-10 02:25:57 +0000 (Sat, 10 Dec 2011)
New Revision: 15522

Added:
   trunk/commons-csv/debian/source/
   trunk/commons-csv/debian/source/format
Modified:
   trunk/commons-csv/debian/ant.properties
   trunk/commons-csv/debian/changelog
   trunk/commons-csv/debian/control
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/commons-csv/debian/ant.properties
===================================================================
--- trunk/commons-csv/debian/ant.properties	2011-12-10 01:59:05 UTC (rev 15521)
+++ trunk/commons-csv/debian/ant.properties	2011-12-10 02:25:57 UTC (rev 15522)
@@ -7,3 +7,8 @@
 #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

Modified: trunk/commons-csv/debian/changelog
===================================================================
--- trunk/commons-csv/debian/changelog	2011-12-10 01:59:05 UTC (rev 15521)
+++ trunk/commons-csv/debian/changelog	2011-12-10 02:25:57 UTC (rev 15522)
@@ -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
 

Modified: trunk/commons-csv/debian/control
===================================================================
--- trunk/commons-csv/debian/control	2011-12-10 01:59:05 UTC (rev 15521)
+++ trunk/commons-csv/debian/control	2011-12-10 02:25:57 UTC (rev 15522)
@@ -6,7 +6,7 @@
 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/

Added: trunk/commons-csv/debian/source/format
===================================================================
--- trunk/commons-csv/debian/source/format	                        (rev 0)
+++ trunk/commons-csv/debian/source/format	2011-12-10 02:25:57 UTC (rev 15522)
@@ -0,0 +1 @@
+3.0 (quilt)