diffstat of debian/ for erlang_18.3-dfsg-1 erlang_18.3-dfsg-1ubuntu3 changelog | 388 ++++++++++++++++++++++++++++++++++ control | 7 patches/bytecode-compat.patch | 32 ++ patches/fix-pointer-converstion.patch | 23 ++ patches/series | 4 patches/x32.patch | 4 rules | 9 7 files changed, 462 insertions(+), 5 deletions(-) diff -Nru erlang-18.3-dfsg/debian/changelog erlang-18.3-dfsg/debian/changelog --- erlang-18.3-dfsg/debian/changelog 2016-03-17 19:30:32.000000000 +0000 +++ erlang-18.3-dfsg/debian/changelog 2016-04-08 08:40:50.000000000 +0000 @@ -1,3 +1,37 @@ +erlang (1:18.3-dfsg-1ubuntu3) xenial; urgency=medium + + * Drop erlang-wx from the Recommends: of erlang-examples, so that this + still stays out of main. + + -- Steve Langasek Fri, 08 Apr 2016 01:40:49 -0700 + +erlang (1:18.3-dfsg-1ubuntu2) xenial; urgency=medium + + * Restore erlang-wx now that main is allowed to build-depend on universe. + LP: #1563182. + * Restore build dependency on fop. + + -- Steve Langasek Fri, 08 Apr 2016 01:30:41 +0000 + +erlang (1:18.3-dfsg-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process, enabling IPv6 support. + - d/control: Build erlang-base-hipe on ppc64 and ppc64el. + - d/control: Drop BD on fop to support demotion to universe. + + -- James Page Tue, 22 Mar 2016 12:25:14 +0000 + erlang (1:18.3-dfsg-1) unstable; urgency=medium * New upstream release. @@ -7,6 +41,25 @@ -- Sergei Golovan Thu, 17 Mar 2016 21:22:08 +0300 +erlang (1:18.2-dfsg-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process, enabling IPv6 support. + - d/control: Build erlang-base-hipe on ppc64 and ppc64el. + - d/control: Drop BD on fop to support demotion to universe. + + -- James Page Thu, 14 Jan 2016 15:44:38 +0200 + erlang (1:18.2-dfsg-2) unstable; urgency=medium * Fixed FTBFS for GNU/kFreeBSD and GNU/Hurd due to incorrectly checked @@ -36,6 +89,30 @@ -- Sergei Golovan Mon, 17 Aug 2015 15:14:59 +0300 +erlang (1:18.0-dfsg-1ubuntu2) xenial; urgency=medium + + * d/control: Drop BD on fop to support demotion to universe. + + -- James Page Mon, 04 Jan 2016 13:56:48 +0000 + +erlang (1:18.0-dfsg-1ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process, enabling IPv6 support. + - d/control: Build erlang-base-hipe on ppc64 and ppc64el. + + -- James Page Wed, 08 Jul 2015 13:52:33 +0100 + erlang (1:18.0-dfsg-1) unstable; urgency=medium * New upstream release. @@ -46,6 +123,24 @@ -- Sergei Golovan Sat, 27 Jun 2015 14:29:01 +0300 +erlang (1:17.5-dfsg-2ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process, enabling IPv6 support. + - d/control: Build erlang-base-hipe on ppc64 and ppc64el. + + -- James Page Tue, 07 Jul 2015 17:42:33 +0100 + erlang (1:17.5-dfsg-2) unstable; urgency=medium * Upload into unstable. @@ -84,6 +179,24 @@ -- Sergei Golovan Sat, 04 Apr 2015 17:00:55 +0300 +erlang (1:17.3-dfsg-3ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process, enabling IPv6 support. + - d/control: Build erlang-base-hipe on ppc64 and ppc64el. + + -- James Page Fri, 05 Dec 2014 13:24:09 +0000 + erlang (1:17.3-dfsg-3) unstable; urgency=medium * Added a patch by Olly Betts which updates hard-coded wx constant values @@ -132,6 +245,30 @@ -- Sergei Golovan Thu, 14 Aug 2014 13:44:54 +0400 +erlang (1:17.1-dfsg-4ubuntu2) utopic; urgency=medium + + * Enable IPv6 support in epmd (LP: #1312507), supporting use in IPv6 + only environments. + - d/rules: Use "-DEPMD6" in CPPFLAGS and ensure this is passed to + relevant bits of the build process. + + -- James Page Tue, 12 Aug 2014 14:51:44 +0100 + +erlang (1:17.1-dfsg-4ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Fri, 25 Jul 2014 16:03:47 +0100 + erlang (1:17.1-dfsg-4) unstable; urgency=medium * Created new file erlang-mode.emacsen-compat with zero value to comply @@ -210,6 +347,27 @@ -- Sergei Golovan Mon, 27 Jan 2014 21:46:45 +0400 +erlang (1:16.b.3-dfsg-1ubuntu2) trusty; urgency=medium + + * Build erlang-base-hipe on ppc64 and ppc64el. + + -- Matthias Klose Fri, 10 Jan 2014 13:30:11 +0100 + +erlang (1:16.b.3-dfsg-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Mon, 06 Jan 2014 11:13:39 +0000 + erlang (1:16.b.3-dfsg-1) unstable; urgency=low * New upstream release. @@ -221,6 +379,21 @@ -- Sergei Golovan Thu, 12 Dec 2013 12:03:35 +0400 +erlang (1:16.b.2-dfsg-2ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk3.0-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Thu, 28 Nov 2013 10:47:24 +0000 + erlang (1:16.b.2-dfsg-2) unstable; urgency=low * Switched to wxWidgets 3.0 from 2.8 for erlang-wx application. @@ -231,6 +404,21 @@ -- Sergei Golovan Thu, 21 Nov 2013 14:51:50 +0400 +erlang (1:16.b.2-dfsg-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Mon, 11 Nov 2013 16:54:10 +0000 + erlang (1:16.b.2-dfsg-1) unstable; urgency=low * New upstream release. @@ -253,6 +441,21 @@ -- Sergei Golovan Sat, 24 Aug 2013 00:24:27 +0400 +erlang (1:16.b.1-dfsg-4ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Wed, 10 Jul 2013 10:51:19 +0100 + erlang (1:16.b.1-dfsg-4) unstable; urgency=low * Fixed the binary packages interdependencies. @@ -283,6 +486,21 @@ -- Sergei Golovan Wed, 19 Jun 2013 14:10:46 +0400 +erlang (1:16.b-dfsg-3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Mon, 13 May 2013 12:46:29 +0100 + erlang (1:16.b-dfsg-3) unstable; urgency=low * Upload to unstable. @@ -304,6 +522,21 @@ -- Sergei Golovan Thu, 28 Feb 2013 09:08:37 +0400 +erlang (1:15.b.1-dfsg-4ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Tue, 05 Feb 2013 15:05:19 +0000 + erlang (1:15.b.1-dfsg-4) unstable; urgency=low * Added link for to_erl communication program to /usr/bin. Also created @@ -344,6 +577,27 @@ -- Sergei Golovan Fri, 07 Sep 2012 14:15:37 +0400 +erlang (1:15.b.1-dfsg-3ubuntu2) quantal; urgency=low + + * Ensure backwards comaptible Java bytecode is built (LP: #1049769): + - d/p/bytecode-compat.patch: Specify source/target = 1.5 when compiling + Java source code. + + -- James Page Thu, 20 Sep 2012 13:51:11 +0100 + +erlang (1:15.b.1-dfsg-3ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + + -- James Page Mon, 02 Jul 2012 14:31:28 +0100 + erlang (1:15.b.1-dfsg-3) unstable; urgency=low * Moved kernel and stdlib include files from erlang-dev to the erlang-base @@ -356,6 +610,20 @@ -- Sergei Golovan Sat, 02 Jun 2012 01:02:17 +0400 +erlang (1:15.b.1-dfsg-2ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/fix-pointer-conversion.patch: Remove implicit integer to + pointer conversion. + - d/control: Drop libwxgtk2.8-dev build dependency. Wx isn't in main, + and not supposed to. + - d/control: Drop erlang-wx binary and associated dependencies from + other erlang-* packages. + - d/rules: Add "+debug_info" to ERL_COMPILE_FLAGS for debug builds. + * Tidied obsolete patches from d/patches. + + -- James Page Fri, 01 Jun 2012 10:07:21 +0100 + erlang (1:15.b.1-dfsg-2) unstable; urgency=low * Depend on procps unconditionally since it works for all architectures now. @@ -408,6 +676,23 @@ -- Sergei Golovan Thu, 15 Dec 2011 19:20:10 +0400 +erlang (1:14.b.4-dfsg-1ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - debian/patches/fix-pointer-conversion.patch: Remove implicit + integer to pointer conversion (patch refreshed) + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + * Dropped changes: + debian/patches/tcp.patch: applied upstream + + -- Clint Byrum Thu, 15 Dec 2011 16:41:11 -0800 + erlang (1:14.b.4-dfsg-1) unstable; urgency=low * New upstream release (closes: #636678). @@ -430,6 +715,40 @@ -- Sergei Golovan Wed, 08 Jun 2011 08:39:43 +0400 +erlang (1:14.b.2-dfsg-3ubuntu2) oneiric; urgency=low + + * debian/patches/fix-pointer-conversion.patch: Remove implicit + integer to pointer conversion (LP: #778474) + + -- Clint Byrum Fri, 06 May 2011 06:10:07 -0700 + +erlang (1:14.b.2-dfsg-3ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + - debian/patches/series: Do what I meant, and enable build-options.patch + instead. + * Additional changes: + - Drop erlang-wx from -et + * Dropped Changes: + - patches/pcre-crash.patch: CVE-2008-2371: outer level option with + alternatives caused crash. (Applied Upstream) + - fix for ssl certificate verification in newSSL: + ssl_cacertfile_fix.patch (Applied Upstream) + - debian/patches/series: Enable native.patch again, to get stripped beam + files and reduce the package size again. (build-options is what + actually accomplished this) + - Remove build-options.patch on advice from upstream and because it caused + odd build failures. + + -- Clint Byrum Thu, 05 May 2011 15:48:43 -0700 + erlang (1:14.b.2-dfsg-3) unstable; urgency=low * Enabled pre-Pentium-4 compatibility in the ethread library @@ -607,6 +926,33 @@ -- Sergei Golovan Sun, 07 Feb 2010 15:01:16 +0300 +erlang (1:13.b.3-dfsg-2ubuntu3) maverick; urgency=low + + * fix for ssl certificate verification in newSSL: ssl_cacertfile_fix.patch + (LP: #643787) + + -- Samuele Pedroni (Canonical Services Ltd.) Fri, 24 Sep 2010 09:35:12 +0200 + +erlang (1:13.b.3-dfsg-2ubuntu2) lucid; urgency=low + + * CVE-2008-2371: outer level option with alternatives caused crash. + (LP: #535090). + + -- Ralf Doering Thu, 11 Mar 2010 15:20:06 +0100 + +erlang (1:13.b.3-dfsg-2ubuntu1) lucid; urgency=low + + * Merge with Debian testing; remaining Ubuntu changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Elliot Murphy Mon, 21 Dec 2009 21:54:16 -0500 + erlang (1:13.b.3-dfsg-2) unstable; urgency=low * Fixed dialyzer(1) manpage which was placed into section 3 and conflicted @@ -625,6 +971,34 @@ -- Sergei Golovan Sat, 19 Dec 2009 19:44:54 +0300 +erlang (1:13.b.2.1-dfsg-1ubuntu3) lucid; urgency=low + + * build-options.patch: Fix to apply to current version. + * debian/patches/series: Do what I meant, and enable build-options.patch + instead. + + -- Martin Pitt Mon, 07 Dec 2009 10:28:47 +0100 + +erlang (1:13.b.2.1-dfsg-1ubuntu2) lucid; urgency=low + + * debian/patches/series: Enable native.patch again, to get stripped beam + files and reduce the package size again. (LP: #493278) + + -- Martin Pitt Mon, 07 Dec 2009 09:02:37 +0100 + +erlang (1:13.b.2.1-dfsg-1ubuntu1) lucid; urgency=low + + * Merge with Debian testing; remaining Ubuntu changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Martin Pitt Fri, 06 Nov 2009 18:54:42 +0100 + erlang (1:13.b.2.1-dfsg-1) unstable; urgency=low * New upstream release (closes: #539269). @@ -681,6 +1055,19 @@ -- Sergei Golovan Tue, 30 Jun 2009 14:13:14 +0400 +erlang (1:13.b.1-dfsg-2ubuntu1) karmic; urgency=low + + * debian/control: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP: #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Martin Pitt Fri, 16 Oct 2009 09:40:16 +0200 + erlang (1:13.b.1-dfsg-2) unstable; urgency=low * Updated manpages for section 1. @@ -1941,3 +2328,4 @@ * Erlang sources for libraries and tools are removed from the bin dist. -- Mark Ng Thu, 4 Feb 1999 23:21:00 +1100 + diff -Nru erlang-18.3-dfsg/debian/control erlang-18.3-dfsg/debian/control --- erlang-18.3-dfsg/debian/control 2016-03-17 19:30:32.000000000 +0000 +++ erlang-18.3-dfsg/debian/control 2016-04-08 08:40:32.000000000 +0000 @@ -1,5 +1,6 @@ Source: erlang -Maintainer: Debian Erlang Packagers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Erlang Packagers Uploaders: Sergei Golovan Section: interpreters Priority: optional @@ -36,7 +37,7 @@ Package: erlang-base-hipe -Architecture: amd64 i386 powerpc sparc solaris-i386 +Architecture: amd64 i386 powerpc ppc64 ppc64el sparc solaris-i386 Priority: extra Depends: procps, adduser, ${shlibs:Depends}, ${misc:Depends} Recommends: ${libsctp:Version}, erlang-crypto (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version}) @@ -556,7 +557,7 @@ Package: erlang-examples Architecture: all Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends} -Recommends: erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-public-key, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx +Recommends: erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-public-key, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-src (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2) Description: Erlang/OTP application examples diff -Nru erlang-18.3-dfsg/debian/patches/bytecode-compat.patch erlang-18.3-dfsg/debian/patches/bytecode-compat.patch --- erlang-18.3-dfsg/debian/patches/bytecode-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ erlang-18.3-dfsg/debian/patches/bytecode-compat.patch 2016-01-14 12:33:45.000000000 +0000 @@ -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 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1049769 + +--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile ++++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile +@@ -91,7 +91,7 @@ ifneq ($(V),0) + JARFLAGS= -cfv + endif + +-JAVA_OPTIONS = ++JAVA_OPTIONS = -source 1.5 -target 1.5 + + # ---------------------------------------------------- + # Make Rules +--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile ++++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +@@ -79,7 +79,7 @@ ifneq ($(V),0) + JARFLAGS=-cfv + endif + +-JAVA_OPTIONS = -Xlint ++JAVA_OPTIONS = -Xlint -source 1.5 -target 1.5 + + ifeq ($(TESTROOT),) + RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)" diff -Nru erlang-18.3-dfsg/debian/patches/fix-pointer-converstion.patch erlang-18.3-dfsg/debian/patches/fix-pointer-converstion.patch --- erlang-18.3-dfsg/debian/patches/fix-pointer-converstion.patch 1970-01-01 00:00:00.000000000 +0000 +++ erlang-18.3-dfsg/debian/patches/fix-pointer-converstion.patch 2016-01-14 12:33:38.000000000 +0000 @@ -0,0 +1,23 @@ +From: Clint Byrum +Subject: resolve buildd failure "Function `erl_malloc' implicitly converted to pointer at legacy/erl_timeout.c:77" +Bug-Ubuntu: https://launchpad.net/bugs/778484 + +--- a/lib/erl_interface/src/legacy/erl_timeout.c ++++ b/lib/erl_interface/src/legacy/erl_timeout.c +@@ -46,6 +46,7 @@ + + #include "erl_interface.h" + #include "erl_timeout.h" ++#include "erl_interface.h" + + typedef struct jmp_s { + jmp_buf jmpbuf; +@@ -76,7 +77,7 @@ jmp_buf *timeout_setup(int ms) + t.it_value.tv_usec = (ms % 1000) * 1000; + + /* get a jump buffer and save it */ +- j = erl_malloc(sizeof(*j)); ++ j = (jmp_t)erl_malloc(sizeof(*j)); + j->siginfo = s; + push(j); + diff -Nru erlang-18.3-dfsg/debian/patches/series erlang-18.3-dfsg/debian/patches/series --- erlang-18.3-dfsg/debian/patches/series 2016-03-17 19:30:32.000000000 +0000 +++ erlang-18.3-dfsg/debian/patches/series 2016-03-18 04:11:09.000000000 +0000 @@ -11,3 +11,7 @@ beamload.patch reproducible-build.patch x32.patch + +# Ubuntu patches +fix-pointer-converstion.patch +bytecode-compat.patch diff -Nru erlang-18.3-dfsg/debian/patches/x32.patch erlang-18.3-dfsg/debian/patches/x32.patch --- erlang-18.3-dfsg/debian/patches/x32.patch 2015-12-27 09:43:47.000000000 +0000 +++ erlang-18.3-dfsg/debian/patches/x32.patch 2016-03-18 04:11:09.000000000 +0000 @@ -5,7 +5,7 @@ --- a/erts/lib_src/pthread/ethread.c +++ b/erts/lib_src/pthread/ethread.c -@@ -195,13 +195,25 @@ +@@ -195,13 +195,25 @@ ethr_x86_cpuid__(int *eax, int *ebx, int * we have the cpuid instruction. */ __asm__ ("pushf\n\t" @@ -31,7 +31,7 @@ "movl $0x0, %0\n\t" "xorl %%ecx, %%eax\n\t" "jz no_cpuid\n\t" -@@ -223,10 +235,19 @@ +@@ -223,10 +235,19 @@ ethr_x86_cpuid__(int *eax, int *ebx, int * B register explicitly (for some reason gcc doesn't provide this * service to us). */ diff -Nru erlang-18.3-dfsg/debian/rules erlang-18.3-dfsg/debian/rules --- erlang-18.3-dfsg/debian/rules 2016-03-17 19:30:32.000000000 +0000 +++ erlang-18.3-dfsg/debian/rules 2016-03-18 04:11:08.000000000 +0000 @@ -71,12 +71,17 @@ CFLAGS=-g -O2 -fno-strict-aliasing GEN_OPT_FLGS=-O2 -fno-strict-aliasing TYPE=debug +ERL_COMPILE_FLAGS="+debug_info" else CFLAGS=-g -O2 -fno-strict-aliasing GEN_OPT_FLGS=-O2 -fno-strict-aliasing TYPE= +ERL_COMPILE_FLAGS="" endif +# Enable IPv6 support in epmd +CPPFLAGS=-DEPMD6 + JAVA_OPTIONS=-source 1.5 -target 1.5 JOBS=4 @@ -179,7 +184,9 @@ [ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -210,7 +217,9 @@ [ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \