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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-08-23 20:25:28 +0000 (Fri, 23 Aug 2013)
New Revision: 1532

Removed:
   erlang/trunk/debian/patches/bytecode-compat.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
[erlang]
Set JAVA_OPTIONS in debian/rules instead of patch.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2013-08-23 19:58:34 UTC (rev 1531)
+++ erlang/trunk/debian/changelog	2013-08-23 20:25:28 UTC (rev 1532)
@@ -4,10 +4,9 @@
     (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.
+  * Ensure that Java bytecode is compatible with Java 1.5.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 23 Aug 2013 23:40:26 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 24 Aug 2013 00:24:27 +0400
 
 erlang (1:16.b.1-dfsg-4) unstable; urgency=low
 

Deleted: erlang/trunk/debian/patches/bytecode-compat.patch
===================================================================
--- erlang/trunk/debian/patches/bytecode-compat.patch	2013-08-23 19:58:34 UTC (rev 1531)
+++ erlang/trunk/debian/patches/bytecode-compat.patch	2013-08-23 20:25:28 UTC (rev 1532)
@@ -1,32 +0,0 @@
-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:58:34 UTC (rev 1531)
+++ erlang/trunk/debian/patches/series	2013-08-23 20:25:28 UTC (rev 1532)
@@ -10,4 +10,3 @@
 powerpc.patch
 odbcserver.patch
 efile.patch
-bytecode-compat.patch

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2013-08-23 19:58:34 UTC (rev 1531)
+++ erlang/trunk/debian/rules	2013-08-23 20:25:28 UTC (rev 1532)
@@ -75,6 +75,8 @@
 TYPE=
 endif
 
+JAVA_OPTIONS=-source 1.5 -target 1.5
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -304,21 +306,21 @@
 build-hipe: build-hipe-stamp
 build-hipe-stamp: configure-hipe-stamp
 	dh_testdir
-	touch build-hipe-stamp
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
+	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
+	touch build-hipe-stamp
 
 build-stnd: build-stnd-stamp
 build-stnd-stamp: configure-stnd-stamp
 	dh_testdir
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
-	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+	${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
+	${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)" emulator
 endif
-	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
+	${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" JAVA_OPTIONS="$(JAVA_OPTIONS)"
 	touch build-stnd-stamp
 
 docs: docs-stamp