[Pkg-erlang-commits] r1531 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-08-23 19:58:34 +0000 (Fri, 23 Aug 2013)
New Revision: 1531

Added:
   erlang/trunk/debian/patches/bytecode-compat.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/series
Log:
[erlang]
  * Added patch from Ubuntu which makes Java bytecode compatible with
    Java 1.5.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2013-08-23 19:10:02 UTC (rev 1530)
+++ erlang/trunk/debian/changelog	2013-08-23 19:58:34 UTC (rev 1531)
@@ -4,8 +4,10 @@
     (closes: #634614).
   * Added patch by upstream which fixes bad_object_header errors in dets
     (closes: #720415).
+  * Added patch from Ubuntu which makes Java bytecode compatible with
+    Java 1.5.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 23 Aug 2013 22:31:17 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 23 Aug 2013 23:40:26 +0400
 
 erlang (1:16.b.1-dfsg-4) unstable; urgency=low
 

Added: erlang/trunk/debian/patches/bytecode-compat.patch
===================================================================
--- erlang/trunk/debian/patches/bytecode-compat.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/bytecode-compat.patch	2013-08-23 19:58:34 UTC (rev 1531)
@@ -0,0 +1,32 @@
+Description: Build backwards compatible bytecode.
+ By default, javac compiles bytecode which is compatible
+ with the Java implementation the JDK originates from and
+ onwards.
+ .
+ This patch ensures that bytecode is compatible with Java
+ 1.5 and up.
+Author: James Page <james.page at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1049769
+
+--- erlang-16.b.1-dfsg.orig/lib/ic/java_src/com/ericsson/otp/ic/Makefile
++++ erlang-16.b.1-dfsg/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+@@ -90,7 +90,7 @@
+ JARFLAGS= -cfv
+ endif
+ 
+-JAVA_OPTIONS = 
++JAVA_OPTIONS = -source 1.5 -target 1.5
+ 
+ # ----------------------------------------------------
+ # Make Rules
+--- erlang-16.b.1-dfsg.orig/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
++++ erlang-16.b.1-dfsg/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+@@ -66,7 +66,7 @@
+ JARFLAGS=-cfv
+ endif
+ 
+-JAVA_OPTIONS = 
++JAVA_OPTIONS = -source 1.5 -target 1.5
+ 
+ ifeq ($(TESTROOT),)
+ RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)"

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2013-08-23 19:10:02 UTC (rev 1530)
+++ erlang/trunk/debian/patches/series	2013-08-23 19:58:34 UTC (rev 1531)
@@ -10,3 +10,4 @@
 powerpc.patch
 odbcserver.patch
 efile.patch
+bytecode-compat.patch