diff -pruN 11.0.7+0-5/debian/bin/python 11.0.7+0-5ubuntu1/debian/bin/python --- 11.0.7+0-5/debian/bin/python 1970-01-01 00:00:00.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/bin/python 2020-04-14 12:30:56.000000000 +0000 @@ -0,0 +1,2 @@ +#! /bin/sh +exec python2 "$@" diff -pruN 11.0.7+0-5/debian/bin/python-config 11.0.7+0-5ubuntu1/debian/bin/python-config --- 11.0.7+0-5/debian/bin/python-config 1970-01-01 00:00:00.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/bin/python-config 2020-04-14 12:30:56.000000000 +0000 @@ -0,0 +1,2 @@ +#! /bin/sh +exec python2-config "$@" diff -pruN 11.0.7+0-5/debian/changelog 11.0.7+0-5ubuntu1/debian/changelog --- 11.0.7+0-5/debian/changelog 2020-09-21 13:06:24.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/changelog 2020-09-22 21:05:26.000000000 +0000 @@ -1,3 +1,15 @@ +openjfx (11.0.7+0-5ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Dropped python2 dependency. + * debian/rules: when building arch and indep packages simultaneously (as + done in Ubuntu builders) the file gradle.properties copied in + override_dh_auto_configure-arch will be overwritten by + override_dh_auto_configure-indep preventing native libraries for media + and webkit from being build. (LP: #1877000) + * Remove/revert patch to force NUM_COMPILE_THREADS=1. + + -- Tiago Stürmer Daitx Tue, 22 Sep 2020 21:05:26 +0000 + openjfx (11.0.7+0-5) unstable; urgency=medium * Team upload. @@ -20,6 +32,13 @@ openjfx (11.0.7+0-3) unstable; urgency=m -- tony mancill Wed, 05 Aug 2020 21:47:08 -0700 +openjfx (11.0.7+0-2ubuntu1) focal; urgency=medium + + * Merge with Debian; remaining changes: + - Build using python2. + + -- Matthias Klose Tue, 14 Apr 2020 14:30:56 +0200 + openjfx (11.0.7+0-2) unstable; urgency=medium * Disable the Gradle version check when building only the arch all package @@ -38,6 +57,12 @@ openjfx (11.0.7+0-1) unstable; urgency=m -- Emmanuel Bourg Fri, 10 Apr 2020 18:40:20 +0200 +openjfx (11.0.2+1-2ubuntu1) focal; urgency=medium + + * Build using python2. + + -- Matthias Klose Sun, 05 Apr 2020 11:10:20 +0200 + openjfx (11.0.2+1-2) unstable; urgency=medium [ Bas Couwenberg ] @@ -403,3 +428,4 @@ openjfx (8u5-b13-1) experimental; urgenc * Initial release (Closes: #748413) -- Emmanuel Bourg Wed, 25 Jun 2014 15:05:20 +0200 + diff -pruN 11.0.7+0-5/debian/control 11.0.7+0-5ubuntu1/debian/control --- 11.0.7+0-5/debian/control 2020-09-21 07:44:22.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/control 2020-09-22 21:05:26.000000000 +0000 @@ -1,7 +1,8 @@ Source: openjfx Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg Build-Depends: antlr4, bison, diff -pruN 11.0.7+0-5/debian/jsmin-noop.py 11.0.7+0-5ubuntu1/debian/jsmin-noop.py --- 11.0.7+0-5/debian/jsmin-noop.py 2020-09-21 11:19:22.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/jsmin-noop.py 2020-09-21 15:59:23.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # This is a reimplementation of the JavaScript minifier included in OpenJFX # which was derived from the non-free jsmin code by Douglas Crockford. This diff -pruN 11.0.7+0-5/debian/patches/33-compile-threads.patch 11.0.7+0-5ubuntu1/debian/patches/33-compile-threads.patch --- 11.0.7+0-5/debian/patches/33-compile-threads.patch 2020-09-21 07:44:22.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/patches/33-compile-threads.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ ---- a/build.gradle -+++ b/build.gradle -@@ -493,11 +493,11 @@ - - // Define the number of threads to use when compiling (specifically for native compilation) - // On Mac we limit it to 1 by default due to problems running gcc in parallel --if (IS_MAC) { -+//if (IS_MAC) { - defineProperty("NUM_COMPILE_THREADS", "1") --} else { -- defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}") --} -+//} else { -+// defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}") -+//} - - // - // The next three sections of properties are used to generate the diff -pruN 11.0.7+0-5/debian/patches/series 11.0.7+0-5ubuntu1/debian/patches/series --- 11.0.7+0-5/debian/patches/series 2020-09-21 13:05:16.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/patches/series 2020-09-22 21:05:08.000000000 +0000 @@ -17,6 +17,5 @@ fix-arm32-build.patch disable-jit-for-non-x86.patch no-error_deprecated-declarations.patch 32-gradle-compatibility.patch -33-compile-threads.patch 34-duplicate-symbols.patch 35-python-streams.patch diff -pruN 11.0.7+0-5/debian/rules 11.0.7+0-5ubuntu1/debian/rules --- 11.0.7+0-5/debian/rules 2020-09-21 07:44:22.000000000 +0000 +++ 11.0.7+0-5ubuntu1/debian/rules 2020-09-22 21:05:26.000000000 +0000 @@ -1,5 +1,8 @@ #!/usr/bin/make -f +PATH := $(PATH):$(CURDIR)/debian/bin +export PATH + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -19,7 +22,7 @@ override_dh_auto_configure-arch: cp debian/gradle.properties . override_dh_auto_configure-indep: - echo "GRADLE_VERSION_CHECK = false" > gradle.properties + echo "GRADLE_VERSION_CHECK = false" >> gradle.properties override_dh_auto_build-arch: # replace the non-free JavaScript minifier with a noop equivalent