diffstat for erlang-16.b.3-dfsg erlang-16.b.3-dfsg changelog | 251 ++++++++++++++++++++++++++++++++++ control | 33 +--- patches/bytecode-compat.patch | 32 ++++ patches/fix-pointer-converstion.patch | 25 +++ patches/series | 2 rules | 4 6 files changed, 326 insertions(+), 21 deletions(-) diff -Nru erlang-16.b.3-dfsg/debian/changelog erlang-16.b.3-dfsg/debian/changelog --- erlang-16.b.3-dfsg/debian/changelog 2013-12-12 08:05:46.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/changelog 2014-01-10 13:31:20.000000000 +0000 @@ -1,3 +1,24 @@ +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. @@ -9,6 +30,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. @@ -19,6 +55,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. @@ -41,6 +92,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. @@ -71,6 +137,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. @@ -92,6 +173,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 @@ -132,6 +228,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 @@ -144,6 +261,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. @@ -196,6 +327,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). @@ -218,6 +366,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 @@ -395,6 +577,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 @@ -413,6 +622,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). @@ -469,6 +706,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. @@ -1729,3 +1979,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-16.b.3-dfsg/debian/control erlang-16.b.3-dfsg/debian/control --- erlang-16.b.3-dfsg/debian/control 2013-11-22 16:06:18.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/control 2014-01-10 13:31:05.000000000 +0000 @@ -1,12 +1,13 @@ Source: erlang -Maintainer: Debian Erlang Packagers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Erlang Packagers Uploaders: Sergei Golovan Section: interpreters Priority: optional Standards-Version: 3.9.4 Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4, libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed, - libwxgtk3.0-dev, dctrl-tools, xsltproc, + dctrl-tools, xsltproc, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsctp-dev [linux-any] Build-Depends-Indep: fop, default-jdk | sun-java6-jdk @@ -35,7 +36,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, ${shlibs:Depends}, ${misc:Depends} Recommends: ${libsctp:Version}, erlang-crypto (= ${binary:Version}), erlang-syntax-tools (= ${binary:Version}) @@ -137,7 +138,7 @@ Package: erlang-debugger Architecture: any -Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP application for debugging and testing @@ -150,7 +151,7 @@ Package: erlang-dialyzer Architecture: any Depends: ${erlang-base}, erlang-syntax-tools (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), erlang, erlang-manpages, erlang-doc +Suggests: erlang-gs (= ${binary:Version}), erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP discrepancy analyzer application Dialyzer is a static analysis tool that identifies software @@ -215,7 +216,7 @@ Package: erlang-et Architecture: any -Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP event tracer application @@ -317,7 +318,7 @@ Package: erlang-observer Architecture: any -Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-et (= ${binary:Version}), erlang-gs (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP application for investigating distributed systems @@ -392,7 +393,7 @@ Package: erlang-reltool Architecture: any -Depends: ${erlang-base}, erlang-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-tools (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP release management tool @@ -541,16 +542,6 @@ It configures and starts a web server as well as all available tools. -Package: erlang-wx -Architecture: any -Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends} -Suggests: erlang, erlang-manpages, erlang-doc -Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) -Description: Erlang/OTP bindings to wxWidgets - The wxErlang application is an API for writing graphical user - interfaces with wxWidgets. - - Package: erlang-xmerl Architecture: any Depends: ${erlang-base}, ${misc:Depends} @@ -597,7 +588,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-asn1, erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx +Recommends: erlang-asn1, erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, 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 @@ -644,7 +635,7 @@ Depends: erlang-base | erlang-base-hipe, erlang-nox, erlang-appmon, erlang-common-test, erlang-debugger, erlang-dialyzer, erlang-et, erlang-gs, erlang-megaco, erlang-observer, erlang-pman, erlang-reltool, - erlang-test-server, erlang-toolbar, erlang-tv, erlang-typer, erlang-wx, + erlang-test-server, erlang-toolbar, erlang-tv, erlang-typer, ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Description: Erlang/OTP applications that require X Window System @@ -664,7 +655,7 @@ erlang-public-key, erlang-reltool, erlang-runtime-tools, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-test-server, erlang-toolbar, erlang-tools, erlang-tv, erlang-typer, erlang-webtool, - erlang-wx, erlang-xmerl, ${misc:Depends} + erlang-xmerl, ${misc:Depends} Recommends: erlang-jinterface, erlang-ic-java, erlang-mode, erlang-src, erlang-examples Suggests: erlang-manpages, erlang-doc diff -Nru erlang-16.b.3-dfsg/debian/patches/bytecode-compat.patch erlang-16.b.3-dfsg/debian/patches/bytecode-compat.patch --- erlang-16.b.3-dfsg/debian/patches/bytecode-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/patches/bytecode-compat.patch 2013-07-10 09:29:30.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 +@@ -90,7 +90,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 +@@ -66,7 +66,7 @@ ifneq ($(V),0) + JARFLAGS=-cfv + endif + +-JAVA_OPTIONS = ++JAVA_OPTIONS = -source 1.5 -target 1.5 + + ifeq ($(TESTROOT),) + RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)" diff -Nru erlang-16.b.3-dfsg/debian/patches/fix-pointer-converstion.patch erlang-16.b.3-dfsg/debian/patches/fix-pointer-converstion.patch --- erlang-16.b.3-dfsg/debian/patches/fix-pointer-converstion.patch 1970-01-01 00:00:00.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/patches/fix-pointer-converstion.patch 2013-07-10 09:29:30.000000000 +0000 @@ -0,0 +1,25 @@ +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 + +Index: erlang-14.b.4-dfsg-1ubuntu1/lib/erl_interface/src/legacy/erl_timeout.c +=================================================================== +--- erlang-14.b.4-dfsg-1ubuntu1.orig/lib/erl_interface/src/legacy/erl_timeout.c 2011-12-15 16:39:50.958344893 -0800 ++++ erlang-14.b.4-dfsg-1ubuntu1/lib/erl_interface/src/legacy/erl_timeout.c 2011-12-15 16:40:45.183171477 -0800 +@@ -45,6 +45,7 @@ + + #include "erl_interface.h" + #include "erl_timeout.h" ++#include "erl_interface.h" + + typedef struct jmp_s { + jmp_buf jmpbuf; +@@ -75,7 +76,7 @@ + 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-16.b.3-dfsg/debian/patches/series erlang-16.b.3-dfsg/debian/patches/series --- erlang-16.b.3-dfsg/debian/patches/series 2013-12-12 08:05:46.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/patches/series 2014-01-06 10:29:09.000000000 +0000 @@ -8,3 +8,5 @@ java.patch hppa.patch powerpc.patch +fix-pointer-converstion.patch +bytecode-compat.patch diff -Nru erlang-16.b.3-dfsg/debian/rules erlang-16.b.3-dfsg/debian/rules --- erlang-16.b.3-dfsg/debian/rules 2013-12-12 08:05:46.000000000 +0000 +++ erlang-16.b.3-dfsg/debian/rules 2013-12-12 15:42:39.000000000 +0000 @@ -69,10 +69,12 @@ 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 JAVA_OPTIONS=-source 1.5 -target 1.5 @@ -177,6 +179,7 @@ [ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -206,6 +209,7 @@ [ ! -f Makefile ] || ${MAKE} -j ${JOBS} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \