[pkg-java] r18258 - in trunk/libapache-poi-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-16 12:21:19 +0000 (Wed, 16 Jul 2014)
New Revision: 18258

Added:
   trunk/libapache-poi-java/debian/patches/06_java8-compatibility.patch
Modified:
   trunk/libapache-poi-java/debian/changelog
   trunk/libapache-poi-java/debian/patches/series
Log:
Fixed a test failure with Java 8



Modified: trunk/libapache-poi-java/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog	2014-07-15 13:47:35 UTC (rev 18257)
+++ trunk/libapache-poi-java/debian/changelog	2014-07-16 12:21:19 UTC (rev 18258)
@@ -1,3 +1,9 @@
+libapache-poi-java (3.10-2) unstable; urgency=medium
+
+  * Fixed a test failure with Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Jul 2014 13:51:22 +0200
+
 libapache-poi-java (3.10-1) unstable; urgency=medium
 
   * New upstream release

Added: trunk/libapache-poi-java/debian/patches/06_java8-compatibility.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/06_java8-compatibility.patch	                        (rev 0)
+++ trunk/libapache-poi-java/debian/patches/06_java8-compatibility.patch	2014-07-16 12:21:19 UTC (rev 18258)
@@ -0,0 +1,14 @@
+Description: Fixes a build failure with Java 8
+Origin: upstream, https://svn.apache.org/r1575563
+--- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java
++++ b/src/java/org/apache/poi/ss/util/DateFormatConverter.java
+@@ -322,6 +322,9 @@
+ 		result.put( "ga_ie", "[$-83C]" );
+ 		result.put( "in", "[$-0421]" );
+ 		result.put( "iw", "[$-40D]" );
++
++		// JDK 8 adds an empty locale-string, see also https://issues.apache.org/jira/browse/LANG-941
++		result.put( "", "[$-0409]" );
+ 		
+ 		return result;
+ 	}

Modified: trunk/libapache-poi-java/debian/patches/series
===================================================================
--- trunk/libapache-poi-java/debian/patches/series	2014-07-15 13:47:35 UTC (rev 18257)
+++ trunk/libapache-poi-java/debian/patches/series	2014-07-16 12:21:19 UTC (rev 18258)
@@ -1,3 +1,4 @@
 01_disable-code-coverage.patch
 04_jar_names.patch
 05_use-local-ooxml-xsds.patch
+06_java8-compatibility.patch