[pkg-java] r15521 - trunk/commons-math/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-10 01:59:05 +0000 (Sat, 10 Dec 2011)
New Revision: 15521

Modified:
   trunk/commons-math/debian/ant.properties
   trunk/commons-math/debian/changelog
   trunk/commons-math/debian/control
   trunk/commons-math/debian/copyright
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/commons-math/debian/ant.properties
===================================================================
--- trunk/commons-math/debian/ant.properties	2011-12-10 01:04:09 UTC (rev 15520)
+++ trunk/commons-math/debian/ant.properties	2011-12-10 01:59:05 UTC (rev 15521)
@@ -1 +1,6 @@
 junit.jar=/usr/share/java/junit4.jar
+# 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-math/debian/changelog
===================================================================
--- trunk/commons-math/debian/changelog	2011-12-10 01:04:09 UTC (rev 15520)
+++ trunk/commons-math/debian/changelog	2011-12-10 01:59:05 UTC (rev 15521)
@@ -1,3 +1,18 @@
+commons-math (2.2-2) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Fix lintian warning with copyright file.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888931) (Closes: #651403):
+    - 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>  Fri, 09 Dec 2011 20:47:07 -0430
+
 commons-math (2.2-1) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/commons-math/debian/control
===================================================================
--- trunk/commons-math/debian/control	2011-12-10 01:04:09 UTC (rev 15520)
+++ trunk/commons-math/debian/control	2011-12-10 01:59:05 UTC (rev 15521)
@@ -1,7 +1,7 @@
 Source: commons-math
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: java
 Priority: optional
 Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs

Modified: trunk/commons-math/debian/copyright
===================================================================
--- trunk/commons-math/debian/copyright	2011-12-10 01:04:09 UTC (rev 15520)
+++ trunk/commons-math/debian/copyright	2011-12-10 01:59:05 UTC (rev 15521)
@@ -9,7 +9,7 @@
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
-Files: src/java/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolator.java, src/java/org/apache/commons/math/ode/GraggBulirschStoerIntegrator.java
+Files: src/java/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolator.java src/java/org/apache/commons/math/ode/GraggBulirschStoerIntegrator.java
 Copyright: Copyright (c) 2004, Ernst Hairer
 License: Apache-2.0 | other
   On Debian GNU/Linux system you can find the complete text of the
@@ -49,8 +49,8 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   ---------- http://www.unige.ch/~hairer/prog/licence.txt ----------
 
-Files: src/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java,
-  src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java,
+Files: src/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java
+  src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java
   src/test/org/apache/commons/math/estimation/MinpackTest.java
 Copyright: Copyright Notice (1999) University of Chicago
 License: Apache-2.0 | other